Merge branch 'mirza_home_page' into 'development_new_design_2.0'

Mirza home page

See merge request Cloud_Solution/diplomatic-quarter!468
merge-update-with-lab-changes
haroon amjad 4 years ago
commit 0c2e3f772b

@ -15,8 +15,8 @@ const PACKAGES_CUSTOMER = '/api/customers';
const PACKAGES_SHOPPING_CART = '/api/shopping_cart_items'; const PACKAGES_SHOPPING_CART = '/api/shopping_cart_items';
const PACKAGES_ORDERS = '/api/orders'; const PACKAGES_ORDERS = '/api/orders';
const PACKAGES_TAMARA_OPT = '/api/orders/paymentoptions/tamara'; const PACKAGES_TAMARA_OPT = '/api/orders/paymentoptions/tamara';
// const BASE_URL = 'https://uat.hmgwebservices.com/'; const BASE_URL = 'https://uat.hmgwebservices.com/';
const BASE_URL = 'https://hmgwebservices.com/'; // const BASE_URL = 'https://hmgwebservices.com/';
// Pharmacy UAT URLs // Pharmacy UAT URLs
// const BASE_PHARMACY_URL = 'https://uat.hmgwebservices.com/epharmacy/api/'; // const BASE_PHARMACY_URL = 'https://uat.hmgwebservices.com/epharmacy/api/';

@ -120,43 +120,54 @@ class _ChildPageState extends State<ChildVaccinePage> with SingleTickerProviderS
], ],
), ),
), ),
InkWell( Column(
onTap: () async { mainAxisAlignment: MainAxisAlignment.end,
await model.deleteBabyOrders(newChild: deleteBaby); crossAxisAlignment: CrossAxisAlignment.end,
children: [
Icon(
Icons.arrow_forward,
size: 18,
),
mHeight(12),
InkWell(
onTap: () async {
await model.deleteBabyOrders(newChild: deleteBaby);
deleteBaby.babyID = model.babyInformationModelList[index].babyID; deleteBaby.babyID = model.babyInformationModelList[index].babyID;
await model.deleteBabyOrders(newChild: deleteBaby); await model.deleteBabyOrders(newChild: deleteBaby);
if (model.isDeleted) { if (model.isDeleted) {
AppToast.showSuccessToast(message: TranslationBase.of(context).recordDeleted); AppToast.showSuccessToast(message: TranslationBase.of(context).recordDeleted);
Navigator.pop(context, model.isDeleted); Navigator.pop(context, model.isDeleted);
} else { } else {
//TODO handling error //TODO handling error
} }
}, },
child: Container( child: Container(
decoration: containerRadius(Colors.grey.withOpacity(0.2), 2000), decoration: containerRadius(Colors.grey.withOpacity(0.2), 2000),
padding: EdgeInsets.only(left: 12, right: 12, top: 8, bottom: 8), padding: EdgeInsets.only(left: 12, right: 12, top: 8, bottom: 8),
child: Row( child: Row(
children: [ children: [
Image.asset( Image.asset(
'assets/images/new-design/garbage.png', 'assets/images/new-design/garbage.png',
width: 16, width: 16,
color: selectedColor, color: selectedColor,
), ),
mWidth(8), mWidth(8),
Text( Text(
TranslationBase.of(context).deleteView, TranslationBase.of(context).deleteView,
style: TextStyle( style: TextStyle(
fontSize: 11, fontSize: 11,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
letterSpacing: -0.33, letterSpacing: -0.33,
color: selectedColor, color: selectedColor,
), ),
),
],
), ),
], ),
), ),
), ],
), ),
], ],
), ),

@ -78,18 +78,18 @@ class _LiveCarePatmentPageState extends State<ClinicTimingsPage> {
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
children: [ children: [
Expanded( Expanded(
flex: 1, flex: 2,
child: Text( child: Text(
item.dayOfWeekStr, item.dayOfWeekStr,
style: TextStyle( style: TextStyle(
fontSize: 13, fontSize: 18,
letterSpacing: -0.42, letterSpacing: -0.72,
fontWeight: FontWeight.w600, fontWeight: FontWeight.bold,
), ),
), ),
), ),
Expanded( Expanded(
flex: 3, flex: 4,
child: Container( child: Container(
width: double.infinity, width: double.infinity,
decoration: cardRadius(12), decoration: cardRadius(12),

Loading…
Cancel
Save