Haroon6138
/
PatientApp-KKUMC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'fatima-new' into 'development'

Browse Source 
Fatima new

See merge request Cloud_Solution/diplomatic-quarter!349
merge-requests/353/merge
Sultan khan 3 years ago
parent d321f07e82 bbb8e04066
commit 8eb67791ca
3 changed files with 91 additions and 220 deletions
Show Stats Download Patch File Download Diff File

81
lib/pages/pharmacies/product_detail.dart
Unescape Escape View File

@ -22,6 +22,8 @@ int price = 0;
var languageID; var languageID;
bool isOverQuantity = false; bool isOverQuantity = false;
bool isInWishlit = false; bool isInWishlit = false;
//int isSelected = 1;
bool isSelected= true;
String itemID; String itemID;
var customerId; var customerId;
CompareList compareItems = new CompareList(); CompareList compareItems = new CompareList();
@ -642,14 +644,12 @@ class __ProductDetailPageState extends State<ProductDetailPage> {
padding: EdgeInsets.only(bottom: 5), padding: EdgeInsets.only(bottom: 5),
// margin: EdgeInsets.symmetric(horizontal: 6, vertical: 4), // margin: EdgeInsets.symmetric(horizontal: 6, vertical: 4),
child: BaseView<PharmacyModuleViewModel>( child: BaseView<PharmacyModuleViewModel>(
onModelReady: (model) =>
model.getRecommendedProducts( onModelReady: (model) => model.getRecommendedProducts(widget.product.id.toString()),
widget.product.id.toString()),
builder: (_, model, wi) => Container( builder: (_, model, wi) => Container(
child: child:
// Text(model.recommendedProductList[0].id), // Text(model.recommendedProductList[0].id),
model.recommendedProductList.length != model.recommendedProductList.length != null
null
? Expanded( ? Expanded(
child: ListView.builder( child: ListView.builder(
scrollDirection: scrollDirection:
@ -657,11 +657,8 @@ class __ProductDetailPageState extends State<ProductDetailPage> {
shrinkWrap: true, shrinkWrap: true,
physics: ScrollPhysics(), physics: ScrollPhysics(),
// physics: NeverScrollableScrollPhysics(), // physics: NeverScrollableScrollPhysics(),
itemCount: model itemCount: model.recommendedProductList.length,
.recommendedProductList itemBuilder: (context, index) {
.length,
itemBuilder:
(context, index) {
return InkWell( return InkWell(
onTap: () { onTap: () {
Navigator.push( Navigator.push(
@ -674,42 +671,22 @@ class __ProductDetailPageState extends State<ProductDetailPage> {
elevation: 2, elevation: 2,
shape: RoundedRectangleBorder( shape: RoundedRectangleBorder(
side: BorderSide( side: BorderSide(
color: Colors color: Colors.grey[300],
.grey[
300],
width: 2), width: 2),
borderRadius: borderRadius: BorderRadius.circular(10)),
BorderRadius margin: EdgeInsets.symmetric(
.circular(
10)),
margin: EdgeInsets
.symmetric(
horizontal: 8, horizontal: 8,
vertical: 0, vertical: 0,
), ),
child: Container( child: Container(
decoration: decoration: BoxDecoration(
BoxDecoration( borderRadius: BorderRadius.all(Radius.circular(15),
borderRadius:
BorderRadius
.all(
Radius.circular(
15),
), ),
), ),
padding: EdgeInsets padding: EdgeInsets.symmetric(horizontal: 4),
.symmetric( width: MediaQuery.of(context).size.width / 3,
horizontal:
4),
width: MediaQuery.of(
context)
.size
.width /
3,
child: Column( child: Column(
crossAxisAlignment: crossAxisAlignment: CrossAxisAlignment.start,
CrossAxisAlignment
.start,
children: [ children: [
Stack( Stack(
children: [ children: [
@ -717,11 +694,10 @@ class __ProductDetailPageState extends State<ProductDetailPage> {
child: Align( child: Align(
alignment: Alignment.topRight, alignment: Alignment.topRight,
child: IconButton( child: IconButton(
icon: Icon(!isInWishlit icon: Icon(!isInWishlit ? Icons.favorite_border : Icons.favorite),
? Icons.favorite_border
: Icons.favorite),
color: !isInWishlit ? Colors.grey : Colors.red, color: !isInWishlit ? Colors.grey : Colors.red,
onPressed: () async { onPressed: () async {
if (customerId != null) { if (customerId != null) {
if (!isInWishlit) { if (!isInWishlit) {
await addToWishlistFunction(model.recommendedProductList[index].id); await addToWishlistFunction(model.recommendedProductList[index].id);
@ -734,29 +710,36 @@ class __ProductDetailPageState extends State<ProductDetailPage> {
setState(() {}); setState(() {});
}, },
)), )),
// itemID.contains(model.recommendedProductList[index].id)
// child: Align(
// alignment: Alignment.topRight,
// child:itemID.contains(model.recommendedProductList[index].id)
// // !isInWishlist // // !isInWishlist
// ? IconButton( // ? IconButton(
// icon: Icon(Icons.favorite_border), // icon: Icon(Icons.favorite_border),
// color: Colors.red, // color: Colors.grey,
// iconSize: 30, // iconSize: 30,
// onPressed: () { // onPressed: () {
// setState(() { // setState(() {
// deleteFromWishlistFunction(itemID); // if (customerId != null && isInWishlit ) {
// }); // deleteFromWishlistFunction(
// model.recommendedProductList[index].id);
// } });
// }, // },
// ) // )
// : IconButton( // : IconButton(
// icon: Icon(Icons.favorite), // icon: Icon(Icons.favorite),
// color: Colors.grey, // color: Colors.red,
// iconSize: 30, // iconSize: 30,
// onPressed: () { // onPressed: () {
// setState(() { // setState(() {
// addToWishlistFunction(itemID); // if (customerId != null && !isInWishlit ) {
// }); // addToWishlistFunction(
// model.recommendedProductList[index].id);
// } });
// }, // },
// ) // )
// // ),
), ),
Container( Container(

225
lib/pages/pharmacies/screens/recommended-product-page.dart
Unescape Escape View File

@ -231,37 +231,21 @@ class _RecommendedProductPageState extends State<RecommendedProductPage>
Stack(children: [ Stack(children: [
Container( Container(
child: Align( child: Align(
alignment: alignment: Alignment.topRight,
Alignment child: itemID.contains(e.id)
.topRight,
child:
itemID.contains(e.id)
// !isInWishlist // !isInWishlist
? IconButton( ? IconButton(icon: Icon(Icons.favorite_border),
icon: color: Colors.grey, iconSize: 30,
Icon(Icons.favorite_border),
color:
Colors.grey,
iconSize:
30,
onPressed: onPressed:
() { () {
setState(() { setState(() {addToWishlistFunction(itemID);
addToWishlistFunction(itemID);
}); });
}, },
) )
: : IconButton(icon: Icon(Icons.favorite),
IconButton( color: Colors.red, iconSize: 30,
icon:
Icon(Icons.favorite),
color:
Colors.red,
iconSize:
30,
onPressed: onPressed:
() { () {setState(() {
setState(() {
deleteFromWishlistFunction(itemID); deleteFromWishlistFunction(itemID);
}); });
}, },
@ -269,149 +253,74 @@ class _RecommendedProductPageState extends State<RecommendedProductPage>
// //
), ),
), ),
Container( Container(margin: EdgeInsets.fromLTRB(0, 16, 10, 16),
margin: EdgeInsets alignment: Alignment.center,
.fromLTRB(0, 16,
10, 16),
alignment:
Alignment.center,
// padding: EdgeInsets.only(left: 25, bottom: 20), // padding: EdgeInsets.only(left: 25, bottom: 20),
child: (e.images != child: (e.images != null && e.images.length > 0)
null && ? Image.network(e.images[0].src.toString(),
e.images.length >
0)
? Image.network(
e.images[0]
.src
.toString(),
// item.images[0].src, // item.images[0].src,
fit: BoxFit fit: BoxFit.cover, height: 60,)
.cover, : Image.asset("assets/images/no_image.png", fit: BoxFit.cover, height: 60,
height: 60,
)
: Image.asset(
"assets/images/no_image.png",
fit: BoxFit
.cover,
height: 60,
), ),
), ),
Container( Container(width: e.rxMessage != null ? MediaQuery.of(context)
width: e.rxMessage != .size.width / 5 : 0,
null padding: EdgeInsets.all(4),
? MediaQuery.of( decoration: BoxDecoration(
context) color: Color(0xffb23838),
.size borderRadius: BorderRadius.only(topLeft: Radius.circular(6)),
.width /
5
: 0,
padding:
EdgeInsets.all(4),
decoration:
BoxDecoration(
color: Color(
0xffb23838),
borderRadius:
BorderRadius.only(
topLeft: Radius
.circular(
6)),
), ),
child: Texts( child: Texts(e.rxMessage != null ? e.rxMessage : "",
e.rxMessage != null
? e.rxMessage
: "",
color: Colors.white, color: Colors.white,
regular: true, regular: true,
fontSize: 10, fontSize: 10,
fontWeight: fontWeight: FontWeight.w400,
FontWeight.w400,
), ),
), ),
]), ]),
Container( Container(
margin: EdgeInsets margin: EdgeInsets
.symmetric( .symmetric(horizontal: 6, vertical: 0,
horizontal: 6,
vertical: 0,
), ),
child: Column( child: Column(
crossAxisAlignment: crossAxisAlignment: CrossAxisAlignment.start,
CrossAxisAlignment
.start,
children: [ children: [
Text( Text(
languageID == "ar" languageID == "ar" ? e.namen : e.name,
? e.namen
: e.name,
style: TextStyle( style: TextStyle(
color: Colors color: Colors.black, fontSize: 13.0,
.black,
fontSize: 13.0,
// fontWeight: FontWeight.bold, // fontWeight: FontWeight.bold,
), ),
), ),
Padding( Padding(
// padding: const EdgeInsets.only(top: 15, bottom: 10), // padding: const EdgeInsets.only(top: 15, bottom: 10),
padding: padding: const EdgeInsets.only(top: 10, bottom: 5),
const EdgeInsets child: Texts("SAR ${e.price}",
.only( bold: true, fontSize: 14,
top: 10,
bottom:
5),
child: Texts(
"SAR ${e.price}",
bold: true,
fontSize: 14,
), ),
), ),
], ],
), ),
), ),
Row( Row(
crossAxisAlignment: crossAxisAlignment: CrossAxisAlignment.start,
CrossAxisAlignment
.start,
children: <Widget>[ children: <Widget>[
Container( Container(
padding: EdgeInsets padding: EdgeInsets.only(right: 10),
.only(
right:
10),
// margin: EdgeInsets.only(left: 5), // margin: EdgeInsets.only(left: 5),
child: Align( child: Align(alignment: Alignment.topLeft,
alignment: child: RatingBar.readOnly(initialRating: e.approvedRatingSum.toDouble(),
Alignment
.topLeft,
child: RatingBar
.readOnly(
initialRating: e
.approvedRatingSum
.toDouble(),
// initialRating: productRate, // initialRating: productRate,
size: 13.0, size: 13.0, filledColor: Colors.yellow[700],
filledColor: emptyColor: Colors.grey[500],
Colors.yellow[ isHalfAllowed: true,
700], halfFilledIcon: Icons.star_half,
emptyColor: filledIcon: Icons.star,
Colors.grey[ emptyIcon: Icons.star,
500],
isHalfAllowed:
true,
halfFilledIcon:
Icons
.star_half,
filledIcon:
Icons
.star,
emptyIcon:
Icons
.star,
), ),
), ),
), ),
Texts( Texts("(${e.approvedTotalReviews.toString()})",
"(${e.approvedTotalReviews.toString()})",
// bold: true, // bold: true,
fontSize: 12, fontSize: 12,
), ),
@ -664,8 +573,7 @@ class _RecommendedProductPageState extends State<RecommendedProductPage>
return Card( return Card(
elevation: 2, elevation: 2,
shape: RoundedRectangleBorder( shape: RoundedRectangleBorder(
side: side: BorderSide(color: Colors.grey[300], width: 2),
BorderSide(color: Colors.grey[300], width: 2),
borderRadius: BorderRadius.circular(10)), borderRadius: BorderRadius.circular(10)),
// //
margin: EdgeInsets.symmetric( margin: EdgeInsets.symmetric(
@ -692,14 +600,12 @@ class _RecommendedProductPageState extends State<RecommendedProductPage>
//wishlistVar[index].id.contains(model.recommendedProductList[index].id) //wishlistVar[index].id.contains(model.recommendedProductList[index].id)
!isInWishlist !isInWishlist
? IconButton( ? IconButton(
icon: Icon( icon: Icon(Icons.favorite_border),
Icons.favorite_border),
color: Colors.grey, color: Colors.grey,
iconSize: 30, iconSize: 30,
onPressed: () { onPressed: () {
setState(() { setState(() {
addToWishlistFunction( addToWishlistFunction(itemID);
itemID);
}); });
}, },
) )
@ -709,8 +615,7 @@ class _RecommendedProductPageState extends State<RecommendedProductPage>
iconSize: 30, iconSize: 30,
onPressed: () { onPressed: () {
setState(() { setState(() {
deleteFromWishlistFunction( deleteFromWishlistFunction(itemID);
itemID);
}); });
}, },
) )
@ -721,30 +626,20 @@ class _RecommendedProductPageState extends State<RecommendedProductPage>
margin: EdgeInsets.fromLTRB(0, 16, 10, 16), margin: EdgeInsets.fromLTRB(0, 16, 10, 16),
alignment: Alignment.center, alignment: Alignment.center,
// padding: EdgeInsets.only(left: 25, bottom: 20), // padding: EdgeInsets.only(left: 25, bottom: 20),
child: (model.recommendedProductList[index] child: (model.recommendedProductList[index].images != null &&
.images != model.recommendedProductList[index].images.length > 0)
null && ? Image.network(model.recommendedProductList[index].images[0].src.toString(),
model.recommendedProductList[index]
.images.length >
0)
? Image.network(
model.recommendedProductList[index]
.images[0].src
.toString(),
// item.images[0].src, // item.images[0].src,
fit: BoxFit.cover, fit: BoxFit.cover,
height: 60, height: 60,
) )
: Image.asset( : Image.asset("assets/images/no_image.png",
"assets/images/no_image.png",
fit: BoxFit.cover, fit: BoxFit.cover,
height: 60, height: 60,
), ),
), ),
Container( Container(
width: model.recommendedProductList[index] width: model.recommendedProductList[index].rxMessage != null
.rxMessage !=
null
? MediaQuery.of(context).size.width / 5 ? MediaQuery.of(context).size.width / 5
: 0, : 0,
padding: EdgeInsets.all(4), padding: EdgeInsets.all(4),
@ -754,11 +649,8 @@ class _RecommendedProductPageState extends State<RecommendedProductPage>
topLeft: Radius.circular(6)), topLeft: Radius.circular(6)),
), ),
child: Texts( child: Texts(
model.recommendedProductList[index] model.recommendedProductList[index].rxMessage != null
.rxMessage != ? model.recommendedProductList[index].rxMessage
null
? model.recommendedProductList[index]
.rxMessage
: "", : "",
color: Colors.white, color: Colors.white,
regular: true, regular: true,
@ -773,12 +665,9 @@ class _RecommendedProductPageState extends State<RecommendedProductPage>
vertical: 2, vertical: 2,
), ),
child: Column( child: Column(
crossAxisAlignment: crossAxisAlignment: CrossAxisAlignment.start,
CrossAxisAlignment.start,
children: [ children: [
Text( Text(model.recommendedProductList[index].name,
model
.recommendedProductList[index].name,
style: TextStyle( style: TextStyle(
color: Colors.black, color: Colors.black,
fontSize: 13.0, fontSize: 13.0,
@ -799,8 +688,7 @@ class _RecommendedProductPageState extends State<RecommendedProductPage>
), ),
), ),
Row( Row(
crossAxisAlignment: crossAxisAlignment: CrossAxisAlignment.start,
CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Container( Container(
padding: EdgeInsets.only( padding: EdgeInsets.only(
@ -809,10 +697,7 @@ class _RecommendedProductPageState extends State<RecommendedProductPage>
child: Align( child: Align(
alignment: Alignment.topLeft, alignment: Alignment.topLeft,
child: RatingBar.readOnly( child: RatingBar.readOnly(
initialRating: model initialRating: model.recommendedProductList[index].approvedRatingSum.toDouble(),
.recommendedProductList[index]
.approvedRatingSum
.toDouble(),
// initialRating: productRate, // initialRating: productRate,
size: 13.0, size: 13.0,
filledColor: Colors.yellow[700], filledColor: Colors.yellow[700],

5
lib/widgets/mobile-no/mobile_no.dart
Unescape Escape View File

@ -2,6 +2,7 @@ import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
import 'package:diplomaticquarterapp/models/mobile_number.dart'; import 'package:diplomaticquarterapp/models/mobile_number.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import '../../Constants.dart'; import '../../Constants.dart';
@ -127,7 +128,9 @@ class _MobileNo extends State<MobileNo> {
controller: widget.controller, controller: widget.controller,
keyboardType: TextInputType.number, keyboardType: TextInputType.number,
maxLength: 10, maxLength: 10,
inputFormatters: <TextInputFormatter>[
FilteringTextInputFormatter.allow(RegExp("[0-9]")),
],
// maxLengthEnforced: true, // maxLengthEnforced: true,
// onChanged: (value) { // onChanged: (value) {
// widget.controller.text = countryCode; // widget.controller.text = countryCode;

Write Preview
Loading…
Cancel
Save