From 74432b6bbb220327d3c1be7a8c37dafa8b551600 Mon Sep 17 00:00:00 2001 From: Sikander Saleem Date: Sun, 3 Oct 2021 17:51:31 +0300 Subject: [PATCH] cmc order log ui changes --- lib/config/config.dart | 4 +- .../NewCMC/new_cmc_step_one_page.dart | 274 ++++---- .../ComprehensiveMedicalCheckup/cmc_page.dart | 71 +- .../orders_log_details_page.dart | 608 ++++++++++++------ .../fragments/home_page_fragment2.dart | 2 +- 5 files changed, 582 insertions(+), 377 deletions(-) diff --git a/lib/config/config.dart b/lib/config/config.dart index 6bf726ac..41d54fd5 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -12,8 +12,8 @@ const PACKAGES_PRODUCTS = '/api/products'; const PACKAGES_CUSTOMER = '/api/customers'; const PACKAGES_SHOPPING_CART = '/api/shopping_cart_items'; const PACKAGES_ORDERS = '/api/orders'; -// const BASE_URL = 'https://uat.hmgwebservices.com/'; -const BASE_URL = 'https://hmgwebservices.com/'; + const BASE_URL = 'https://uat.hmgwebservices.com/'; +// const BASE_URL = 'https://hmgwebservices.com/'; // Pharmacy UAT URLs const BASE_PHARMACY_URL = 'https://uat.hmgwebservices.com/epharmacy/api/'; diff --git a/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/NewCMC/new_cmc_step_one_page.dart b/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/NewCMC/new_cmc_step_one_page.dart index d4e2ee02..3c1ceea4 100644 --- a/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/NewCMC/new_cmc_step_one_page.dart +++ b/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/NewCMC/new_cmc_step_one_page.dart @@ -7,6 +7,7 @@ import 'package:diplomaticquarterapp/theme/colors.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/uitl/utils.dart'; import 'package:diplomaticquarterapp/uitl/utils_new.dart'; +import 'package:diplomaticquarterapp/widgets/buttons/defaultButton.dart'; import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'package:flutter/cupertino.dart'; @@ -22,7 +23,7 @@ class NewCMCStepOnePage extends StatefulWidget { final double latitude; final double longitude; - const NewCMCStepOnePage({Key key, this.cMCInsertPresOrderRequestModel, this.model, this.changePageViewIndex,this.latitude,this.longitude}) : super(key: key); + const NewCMCStepOnePage({Key key, this.cMCInsertPresOrderRequestModel, this.model, this.changePageViewIndex, this.latitude, this.longitude}) : super(key: key); @override _NewCMCStepOnePageState createState() => _NewCMCStepOnePageState(); @@ -41,160 +42,151 @@ class _NewCMCStepOnePageState extends State { return AppScaffold( isShowAppBar: false, baseViewModel: widget.model, - body: SingleChildScrollView( - physics: ScrollPhysics(), - child: Container( - margin: EdgeInsets.only(left: 12, right: 12), - child: Center( - child: Column( - children: [ - ListView.separated( - physics: NeverScrollableScrollPhysics(), - shrinkWrap: true, - itemBuilder: (context, index) { - return Row( - children: [ - Radio( - value: widget.model.cmcAllServicesList[index].serviceID, - activeColor: Colors.red[800], - onChanged: (newValue) async { - PatientERCMCInsertServicesList patientERCMCInsertServicesList = new PatientERCMCInsertServicesList( - price: widget.model.cmcAllServicesList[index].price, - serviceID: widget.model.cmcAllServicesList[index].serviceID.toString(), - selectedServiceName: widget.model.cmcAllServicesList[index].description, - selectedServiceNameAR: widget.model.cmcAllServicesList[index].descriptionN, - recordID: 1, - totalPrice: widget.model.cmcAllServicesList[index].totalPrice, - vAT: widget.model.cmcAllServicesList[index].vAT); - setState(() { - widget.cMCInsertPresOrderRequestModel.patientERCMCInsertServicesList = [patientERCMCInsertServicesList]; - }); - CMCGetItemsRequestModel cMCGetItemsRequestModel = new CMCGetItemsRequestModel(checkupType: newValue); - await widget.model.getCheckupItems(cMCGetItemsRequestModel: cMCGetItemsRequestModel); - }, - groupValue: widget.cMCInsertPresOrderRequestModel.patientERCMCInsertServicesList.length > 0 - ? int.parse(widget.cMCInsertPresOrderRequestModel.patientERCMCInsertServicesList[0].serviceID) - : 1), - Expanded( - child: Padding( - padding: const EdgeInsets.only( - left: 10, - right: 10, - top: 20, - bottom: 20, - ), - child: Text( - projectViewModel.isArabic ? widget.model.cmcAllServicesList[index].descriptionN : widget.model.cmcAllServicesList[index].description, - style: TextStyle( - fontSize: 14, - fontWeight: FontWeight.w600, - letterSpacing: -0.45, + body: Column( + children: [ + Expanded( + child: SingleChildScrollView( + physics: BouncingScrollPhysics(), + padding: EdgeInsets.all(21), + child: Column( + children: [ + ListView.separated( + physics: NeverScrollableScrollPhysics(), + shrinkWrap: true, + itemBuilder: (context, index) { + return Row( + children: [ + Radio( + value: widget.model.cmcAllServicesList[index].serviceID, + activeColor: Colors.red[800], + onChanged: (newValue) async { + PatientERCMCInsertServicesList patientERCMCInsertServicesList = new PatientERCMCInsertServicesList( + price: widget.model.cmcAllServicesList[index].price, + serviceID: widget.model.cmcAllServicesList[index].serviceID.toString(), + selectedServiceName: widget.model.cmcAllServicesList[index].description, + selectedServiceNameAR: widget.model.cmcAllServicesList[index].descriptionN, + recordID: 1, + totalPrice: widget.model.cmcAllServicesList[index].totalPrice, + vAT: widget.model.cmcAllServicesList[index].vAT); + setState(() { + widget.cMCInsertPresOrderRequestModel.patientERCMCInsertServicesList = [patientERCMCInsertServicesList]; + }); + CMCGetItemsRequestModel cMCGetItemsRequestModel = new CMCGetItemsRequestModel(checkupType: newValue); + await widget.model.getCheckupItems(cMCGetItemsRequestModel: cMCGetItemsRequestModel); + }, + groupValue: widget.cMCInsertPresOrderRequestModel.patientERCMCInsertServicesList.length > 0 + ? int.parse(widget.cMCInsertPresOrderRequestModel.patientERCMCInsertServicesList[0].serviceID) + : 1), + Expanded( + child: Padding( + padding: const EdgeInsets.only( + left: 10, + right: 10, + top: 20, + bottom: 20, + ), + child: Text( + projectViewModel.isArabic ? widget.model.cmcAllServicesList[index].descriptionN : widget.model.cmcAllServicesList[index].description, + style: TextStyle( + fontSize: 14, + fontWeight: FontWeight.w600, + letterSpacing: -0.45, + ), ), ), ), - ), - ], - ); - }, - separatorBuilder: (context, index) { - return mDivider(Colors.grey); - }, - itemCount: widget.model.cmcAllServicesList.length), - Card( - shape: cardRadius(12), - elevation: 4, - child: Container( - width: double.infinity, - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Padding( - padding: const EdgeInsets.only(left: 12,right: 12,top: 12), - child: Text( - TranslationBase.of(context).coveredService, - style: TextStyle( - fontSize: 14, - fontWeight: FontWeight.w600, - letterSpacing: -0.45, + ], + ); + }, + separatorBuilder: (context, index) { + return mDivider(Colors.grey); + }, + itemCount: widget.model.cmcAllServicesList.length), + Card( + shape: cardRadius(12), + elevation: 4, + child: Container( + width: double.infinity, + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Padding( + padding: const EdgeInsets.only(left: 12, right: 12, top: 12), + child: Text( + TranslationBase.of(context).coveredService, + style: TextStyle( + fontSize: 14, + fontWeight: FontWeight.w600, + letterSpacing: -0.45, + ), ), ), - ), - ListView.separated( - itemBuilder: (context, index) { - return Padding( - padding: const EdgeInsets.all(12.0), - child: Text( - widget.model.checkupItems[index].itemName, - style: TextStyle( - fontSize: 12, - fontWeight: FontWeight.w600, - letterSpacing: -0.45, + ListView.separated( + itemBuilder: (context, index) { + return Padding( + padding: const EdgeInsets.all(12.0), + child: Text( + widget.model.checkupItems[index].itemName, + style: TextStyle( + fontSize: 12, + fontWeight: FontWeight.w600, + letterSpacing: -0.45, + ), ), - ), - ); - }, - separatorBuilder: (context, index) { - return mDivider(Colors.grey); - }, - physics: NeverScrollableScrollPhysics(), - shrinkWrap: true, - itemCount: widget.model.checkupItems.length, - ), - ], + ); + }, + separatorBuilder: (context, index) { + return mDivider(Colors.grey); + }, + physics: NeverScrollableScrollPhysics(), + shrinkWrap: true, + itemCount: widget.model.checkupItems.length, + ), + ], + ), ), ), - ), - mHeight(MediaQuery.of(context).size.height * 0.12), - ], + ], + ), ), ), - ), - ), - bottomSheet: Container( - height: MediaQuery.of(context).size.height * 0.10, - width: double.infinity, - color: CustomColors.appBackgroudGreyColor, - child: Column( - crossAxisAlignment: CrossAxisAlignment.center, - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Container( - width: MediaQuery.of(context).size.width * 0.9, - child: SecondaryButton( - label: TranslationBase.of(context).next, - textColor: Theme.of(context).backgroundColor, - color: CustomColors.accentColor, - onTap: () async { - if (widget.cMCInsertPresOrderRequestModel.patientERCMCInsertServicesList.length != 0 || widget.cMCInsertPresOrderRequestModel.patientERCMCInsertServicesList == null) { - int index = widget.model.cmcAllServicesList.length; - PatientERCMCInsertServicesList patientERCMCInsertServicesList = new PatientERCMCInsertServicesList( - price: widget.model.cmcAllServicesList[index - 1].price, - serviceID: widget.model.cmcAllServicesList[index - 1].serviceID.toString(), - selectedServiceName: widget.model.cmcAllServicesList[index - 1].description, - selectedServiceNameAR: widget.model.cmcAllServicesList[index - 1].descriptionN, - recordID: 1, - totalPrice: widget.model.cmcAllServicesList[index - 1].totalPrice, - vAT: widget.model.cmcAllServicesList[index - 1].vAT); + Container( + color: Colors.white, + padding: EdgeInsets.only(top: 16, bottom: 16, right: 21, left: 21), + child: DefaultButton( + TranslationBase.of(context).next, + () async { + if (widget.cMCInsertPresOrderRequestModel.patientERCMCInsertServicesList.length != 0 || widget.cMCInsertPresOrderRequestModel.patientERCMCInsertServicesList == null) { + int index = widget.model.cmcAllServicesList.length; + PatientERCMCInsertServicesList patientERCMCInsertServicesList = new PatientERCMCInsertServicesList( + price: widget.model.cmcAllServicesList[index - 1].price, + serviceID: widget.model.cmcAllServicesList[index - 1].serviceID.toString(), + selectedServiceName: widget.model.cmcAllServicesList[index - 1].description, + selectedServiceNameAR: widget.model.cmcAllServicesList[index - 1].descriptionN, + recordID: 1, + totalPrice: widget.model.cmcAllServicesList[index - 1].totalPrice, + vAT: widget.model.cmcAllServicesList[index - 1].vAT); - widget.cMCInsertPresOrderRequestModel.patientERCMCInsertServicesList = [patientERCMCInsertServicesList]; - await widget.model.getCustomerInfo(); - if (widget.model.state == ViewState.ErrorLocal) { - Utils.showErrorToast(); - } else { - navigateTo(context,NewCMCStepTowPage( - longitude: widget.longitude, - latitude: widget.latitude, - cmcInsertPresOrderRequestModel: widget.cMCInsertPresOrderRequestModel, - model: widget.model, - )); + widget.cMCInsertPresOrderRequestModel.patientERCMCInsertServicesList = [patientERCMCInsertServicesList]; + await widget.model.getCustomerInfo(); + if (widget.model.state == ViewState.ErrorLocal) { + Utils.showErrorToast(); + } else { + navigateTo( + context, + NewCMCStepTowPage( + longitude: widget.longitude, + latitude: widget.latitude, + cmcInsertPresOrderRequestModel: widget.cMCInsertPresOrderRequestModel, + model: widget.model, + )); // widget.changePageViewIndex(1); - } } - }, - ), + } + }, ), - ], - ), + ), + ], ), ); } diff --git a/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/cmc_page.dart b/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/cmc_page.dart index 652f9b48..42212c40 100644 --- a/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/cmc_page.dart +++ b/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/cmc_page.dart @@ -2,12 +2,14 @@ import 'dart:ui'; import 'package:diplomaticquarterapp/core/model/ImagesInfo.dart'; import 'package:diplomaticquarterapp/core/viewModels/AlHabibMedicalService/cmc_view_model.dart'; +import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart'; import 'package:diplomaticquarterapp/pages/base/base_view.dart'; import 'package:diplomaticquarterapp/theme/colors.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; import 'NewCMC/new_cmc_page.dart'; import 'orders_log_details_page.dart'; @@ -34,6 +36,7 @@ class _CMCPageState extends State with SingleTickerProviderStateMixin { @override Widget build(BuildContext context) { + ProjectViewModel projectViewModel = Provider.of(context); return BaseView( onModelReady: (model) async { await model.getCmcAllPresOrders(); @@ -47,61 +50,35 @@ class _CMCPageState extends State with SingleTickerProviderStateMixin { appBarTitle: TranslationBase.of(context).comprehensiveMedicalCheckup, showNewAppBar: true, showNewAppBarTitle: true, - backgroundColor: CustomColors.appBackgroudGreyColor, + backgroundColor: CustomColors.appBackgroudGrey2Color, body: Column( children: [ - Container( - height: 60.0, - width: double.infinity, - child: Center( - child: TabBar( - isScrollable: false, - controller: _tabController, - indicatorWeight: 3.0, - indicatorSize: TabBarIndicatorSize.tab, - indicatorColor: CustomColors.accentColor, - labelColor: Colors.black, - labelPadding: EdgeInsets.only(top: 4.0, left: 18.0, right: 18.0), - unselectedLabelColor: Colors.grey[800], - tabs: [ - Center( - child: Text( - TranslationBase.of(context).comprehensiveMedicalCheckup, - textAlign: TextAlign.center, - style: TextStyle( - fontSize: 13, - fontWeight: FontWeight.w600, - letterSpacing: -0.34, - ), - ), - ), - Center( - child: Text( - TranslationBase.of(context).orderLog, - textAlign: TextAlign.center, - style: TextStyle( - fontSize: 13, - fontWeight: FontWeight.w600, - letterSpacing: -0.34, - ), - ), - ), - ], - ), + TabBar( + controller: _tabController, + indicatorWeight: 3.0, + indicatorSize: TabBarIndicatorSize.tab, + labelColor: Color(0xff2B353E), + unselectedLabelColor: Color(0xff575757), + labelPadding: EdgeInsets.only(top: 15, bottom: 13, left: 20, right: 20), + labelStyle: TextStyle( + fontFamily: projectViewModel.isArabic ? 'Cairo' : 'Poppins', + fontSize: 16, + fontWeight: FontWeight.w600, + letterSpacing: -0.48, ), + unselectedLabelStyle: TextStyle( + fontFamily: projectViewModel.isArabic ? 'Cairo' : 'Poppins', + fontSize: 16, + fontWeight: FontWeight.w600, + letterSpacing: -0.48, + ), + tabs: [Text(TranslationBase.of(context).cmcHeading), Text(TranslationBase.of(context).orderLog)], ), Expanded( child: TabBarView( physics: BouncingScrollPhysics(), controller: _tabController, - children: [ - NewCMCPage( - model: model, - ), - OrdersLogDetailsPage( - model: model, - ) - ], + children: [NewCMCPage(model: model), OrdersLogDetailsPage(model: model)], ), ) ], diff --git a/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/orders_log_details_page.dart b/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/orders_log_details_page.dart index 2cbfcd42..e18b54db 100644 --- a/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/orders_log_details_page.dart +++ b/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/orders_log_details_page.dart @@ -7,7 +7,9 @@ import 'package:diplomaticquarterapp/uitl/app_toast.dart'; import 'package:diplomaticquarterapp/uitl/date_uitl.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/uitl/utils.dart'; +import 'package:diplomaticquarterapp/uitl/utils_new.dart'; import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart'; +import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; @@ -44,10 +46,128 @@ class OrdersLogDetailsPage extends StatelessWidget { return AppScaffold( isShowAppBar: false, baseViewModel: model, - body: SingleChildScrollView( + body: + + // ListView.separated( + // physics: BouncingScrollPhysics(), + // padding: EdgeInsets.all(21), + // separatorBuilder: (context, index) { + // return SizedBox(height: 12); + // }, + // itemBuilder: (context, index) { + // int status = model.cmcAllPresOrders[index].status; + // String _statusDisp = projectViewModel.isArabic ? model.cmcAllPresOrders[index].descriptionN : model.cmcAllPresOrders[index].description; + // Color _color; + // if (status == 1) { + // //pending + // _color = Color(0xffCC9B14); + // } else if (status == 2) { + // //processing + // _color = Color(0xff2E303A); + // } else if (status == 3) { + // //completed + // _color = Color(0xff359846); + // } else if (status == 4) { + // //cancel // Rejected + // _color = Color(0xffD02127); + // } + // + // return InkWell( + // // onTap: () => Navigator.push( + // // context, + // // FadePage( + // // page: PrescriptionsHistoryDetailsPage( + // // prescriptionsOrder: prescriptionsViewModel.prescriptionsHistory[index], + // // ), + // // ), + // // ), + // child: Container( + // height: 65, + // decoration: BoxDecoration( + // color: Colors.white, + // borderRadius: BorderRadius.all( + // Radius.circular(10.0), + // ), + // boxShadow: [ + // BoxShadow( + // color: Color(0xff000000).withOpacity(.05), + // blurRadius: 27, + // offset: Offset(0, -3), + // ), + // ], + // ), + // child: Row( + // mainAxisSize: MainAxisSize.min, + // children: [ + // Container( + // width: 6, + // decoration: BoxDecoration( + // color: _color, + // borderRadius: BorderRadius.only( + // topLeft: projectViewModel.isArabic ? Radius.circular(0.0) : Radius.circular(10.0), + // bottomLeft: projectViewModel.isArabic ? Radius.circular(0.0) : Radius.circular(10.0), + // topRight: projectViewModel.isArabic ? Radius.circular(10.0) : Radius.circular(0.0), + // bottomRight: projectViewModel.isArabic ? Radius.circular(10.0) : Radius.circular(0.0), + // ), + // ), + // ), + // Expanded( + // child: Padding( + // padding: EdgeInsets.only(left: projectViewModel.isArabic ? 6 : 12, right: projectViewModel.isArabic ? 12 : 6), + // child: Row( + // crossAxisAlignment: CrossAxisAlignment.start, + // mainAxisSize: MainAxisSize.min, + // children: [ + // Expanded( + // child: Column( + // mainAxisSize: MainAxisSize.min, + // crossAxisAlignment: CrossAxisAlignment.start, + // children: [ + // Text( + // _statusDisp, + // style: TextStyle(fontSize: 12, fontWeight: FontWeight.w600, color: _color, letterSpacing: -0.4, height: 16 / 10), + // ), + // Text( + // '${TranslationBase.of(context).orderNo}. ${model.cmcAllPresOrders[index].iD}', + // style: TextStyle(fontSize: 16, fontWeight: FontWeight.w600, color: Color(0xff2E303A), letterSpacing: -0.64, height: 25 / 16), + // ), + // ], + // ), + // ), + // Column( + // mainAxisSize: MainAxisSize.min, + // crossAxisAlignment: CrossAxisAlignment.end, + // children: [ + // Text( + // DateUtil.formatDateToDate(DateUtil.convertStringToDate(model.cmcAllPresOrders[index].createdOn), projectViewModel.isArabic), + // style: TextStyle(fontSize: 12, fontWeight: FontWeight.w600, color: Color(0xff2B353E), letterSpacing: -0.4, height: 16 / 10), + // ), + // Text( + // DateUtil.formatDateToTime(DateUtil.convertStringToDate(model.cmcAllPresOrders[index].createdOn)), + // style: TextStyle(fontSize: 12, fontWeight: FontWeight.w600, color: Color(0xff575757), letterSpacing: -0.4, height: 16 / 10), + // ), + // ], + // ) + // ], + // ), + // ), + // ), + // Icon( + // Icons.arrow_forward_ios, + // size: 16, + // ), + // mWidth(6), + // ], + // ), + // )); + // }, + // itemCount: model.cmcAllPresOrders.length, + // ), + + SingleChildScrollView( physics: ScrollPhysics(), child: Container( - margin: EdgeInsets.all(12), + margin: EdgeInsets.all(10), child: Center( child: FractionallySizedBox( widthFactor: 0.94, @@ -58,194 +178,100 @@ class OrdersLogDetailsPage extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: model.cmcAllPresOrders.map((order) { return Container( + // margin: EdgeInsets.all(10), + child: Container( width: double.infinity, - margin: EdgeInsets.only(top: 12), - clipBehavior: Clip.antiAlias, - decoration: BoxDecoration(border: Border.all(color: Colors.grey, width: 1), borderRadius: BorderRadius.circular(12), color: Colors.white), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - SizedBox( - height: 6, - ), - Container( - width: double.infinity, - padding: EdgeInsets.only(left: 15, bottom: 15, top: 8, right: 15), - decoration: BoxDecoration( - border: Border( - bottom: BorderSide( - color: Colors.grey, - width: 1.0, - ), - ), - // borderRadius: BorderRadius.circular(12), - ), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - TranslationBase.of(context).requestID, - style: TextStyle( - fontSize: 13, - fontWeight: FontWeight.w600, - letterSpacing: -0.45, - ), - ), - SizedBox( - height: 4, - ), - Text( - order.iD.toString(), - style: TextStyle( - fontSize: 18, - fontWeight: FontWeight.w600, - letterSpacing: -0.45, - ), - ), - ], - ), - ), - Container( - width: double.infinity, - padding: EdgeInsets.only(left: 15, bottom: 15, top: 15, right: 15), - decoration: BoxDecoration( - border: Border( - bottom: BorderSide( - color: Colors.grey, - width: 1.0, - ), - ), - // borderRadius: BorderRadius.circular(12), - ), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - TranslationBase.of(context).OrderStatus, - style: TextStyle( - fontSize: 13, - fontWeight: FontWeight.w600, - letterSpacing: -0.45, - ), - ), - SizedBox( - height: 4, - ), - Text( - projectViewModel.isArabic ? order.descriptionN : order.description, - style: TextStyle( - fontSize: 18, - fontWeight: FontWeight.w600, - letterSpacing: -0.45, - ), + padding: EdgeInsets.only(left: 12, right: 12, top: 12), + child: Card( + shape: cardRadius(12), + elevation: 2, + margin: EdgeInsets.zero, + color: order.status == 4 + ? Colors.red[900] + : order.status == 3 + ? Colors.green[400] + : Color(0xffcd9e1b), + clipBehavior: Clip.antiAlias, + child: Container( + // decoration: containerColorRadiusLeft(Colors.white, 12), + margin: EdgeInsets.only(left: projectViewModel.isArabic ? 0 : 8, right: projectViewModel.isArabic ? 8 : 0), + padding: EdgeInsets.all(12), + // color: Colors.white, + decoration: BoxDecoration( + shape: BoxShape.rectangle, + color: Colors.white, + borderRadius: BorderRadius.only( + topLeft: projectViewModel.isArabic ? Radius.zero : Radius.circular(12.0), + topRight: projectViewModel.isArabic ? Radius.circular(12.0) : Radius.zero, + bottomLeft: projectViewModel.isArabic ? Radius.zero : Radius.circular(12.0), + bottomRight: projectViewModel.isArabic ? Radius.circular(12.0) : Radius.zero, ), - ], - ), - ), - Container( - width: double.infinity, - padding: EdgeInsets.only(left: 15, bottom: 15, top: 15, right: 15), - decoration: BoxDecoration( - border: Border( - bottom: BorderSide( - color: Colors.grey, - width: 1.0, - ), - ), - // borderRadius: BorderRadius.circular(12), ), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - TranslationBase.of(context).pickupDate, - style: TextStyle( - fontSize: 13, - fontWeight: FontWeight.w600, - letterSpacing: -0.45, - ), - ), - SizedBox( - height: 4, - ), - Text( - DateUtil.getDayMonthYearDateFormatted(DateUtil.convertStringToDate(order.createdOn)), - style: TextStyle( - fontSize: 18, - fontWeight: FontWeight.w600, - letterSpacing: -0.45, - ), - ), - ], - ), - ), - Container( - width: double.infinity, - clipBehavior: Clip.antiAlias, - padding: EdgeInsets.only(left: 15, bottom: 15, top: 15, right: 15), - decoration: BoxDecoration( - border: Border( - bottom: BorderSide( - color: (order.status == 1 || order.status == 2) ? Colors.grey : Colors.transparent, - width: (order.status == 1 || order.status == 2) ? 1.0 : 0, - ), - ), - // borderRadius: BorderRadius.circular(12), - ), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - TranslationBase.of(context).orderLocation, - style: TextStyle( - fontSize: 13, - fontWeight: FontWeight.w600, - letterSpacing: -0.45, - ), - ), - SizedBox( - height: 4, - ), - Text( - !projectViewModel.isArabic ? order.projectDescription.toString() : order.projectDescriptionN.toString(), - style: TextStyle( - fontSize: 13, - fontWeight: FontWeight.w600, - letterSpacing: -0.45, + // clipBehavior: Clip.antiAlias, + child: Row( + children: [ + Expanded( + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Texts( + TranslationBase.of(context).OrderStatus + ' ' + (projectViewModel.isArabic ? order.descriptionN : order.description), + bold: false, + fontSize: 12, + color: order.status == 4 + ? Colors.red[900] + : order.status == 3 + ? Colors.green[400] + : Color(0xffcd9e1b), + fontWeight: FontWeight.bold, + ), + Texts( + TranslationBase.of(context).requestID + ' ' + order.iD.toString(), + fontWeight: FontWeight.w600, + fontSize: 18, + ), + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Texts( + TranslationBase.of(context).orderLocation, + bold: false, + fontSize: 13, + ), + SizedBox( + height: 4, + ), + Texts( + !projectViewModel.isArabic ? order.nearestProjectDescription.toString() : order.nearestProjectDescriptionN.toString(), + fontSize: 13, + ), + ], + ) + ], + )), + Column( + children: [ + Texts( + DateUtil.getDayMonthYearDateFormatted(DateUtil.convertStringToDate(order.createdOn)), + fontSize: 14, + ), + SizedBox(height: 8), + (order.status == 1 || order.status == 2) + ? SecondaryButton( + onTap: () { + showConfirmMessage(model, order); + }, + label: TranslationBase.of(context).cancel, + color: Colors.red[900], + small: true, + ) + : SizedBox() + ], ), - ), - ], - ), - ), - (order.status == 1 || order.status == 2) - ? SizedBox( - height: 12, - ) - : Container(), - if (order.status == 1 || order.status == 2) - Center( - child: Container( - width: MediaQuery.of(context).size.width * 0.85, - child: SecondaryButton( - label: TranslationBase.of(context).cancel.toUpperCase(), - onTap: () { - showConfirmMessage(model, order); - }, - color: Colors.red[800], - disabled: false, - textColor: Theme.of(context).backgroundColor), - ), - ), - (order.status == 1 || order.status == 2) - ? SizedBox( - height: 12, - ) - : SizedBox( - height: 2, - ), - ], - ), - ); + ], + ))), + )); }).toList()) ], ), @@ -253,6 +279,216 @@ class OrdersLogDetailsPage extends StatelessWidget { ), ), ), + + // SingleChildScrollView( + // physics: ScrollPhysics(), + // child: Container( + // margin: EdgeInsets.all(12), + // child: Center( + // child: FractionallySizedBox( + // widthFactor: 0.94, + // child: Column( + // crossAxisAlignment: CrossAxisAlignment.start, + // children: [ + // Column( + // crossAxisAlignment: CrossAxisAlignment.start, + // children: model.cmcAllPresOrders.map((order) { + // return Container( + // width: double.infinity, + // margin: EdgeInsets.only(top: 12), + // clipBehavior: Clip.antiAlias, + // decoration: BoxDecoration(border: Border.all(color: Colors.grey, width: 1), borderRadius: BorderRadius.circular(12), color: Colors.white), + // child: Column( + // crossAxisAlignment: CrossAxisAlignment.start, + // children: [ + // SizedBox( + // height: 6, + // ), + // Container( + // width: double.infinity, + // padding: EdgeInsets.only(left: 15, bottom: 15, top: 8, right: 15), + // decoration: BoxDecoration( + // border: Border( + // bottom: BorderSide( + // color: Colors.grey, + // width: 1.0, + // ), + // ), + // // borderRadius: BorderRadius.circular(12), + // ), + // child: Column( + // crossAxisAlignment: CrossAxisAlignment.start, + // children: [ + // Text( + // TranslationBase.of(context).requestID, + // style: TextStyle( + // fontSize: 13, + // fontWeight: FontWeight.w600, + // letterSpacing: -0.45, + // ), + // ), + // SizedBox( + // height: 4, + // ), + // Text( + // order.iD.toString(), + // style: TextStyle( + // fontSize: 18, + // fontWeight: FontWeight.w600, + // letterSpacing: -0.45, + // ), + // ), + // ], + // ), + // ), + // Container( + // width: double.infinity, + // padding: EdgeInsets.only(left: 15, bottom: 15, top: 15, right: 15), + // decoration: BoxDecoration( + // border: Border( + // bottom: BorderSide( + // color: Colors.grey, + // width: 1.0, + // ), + // ), + // // borderRadius: BorderRadius.circular(12), + // ), + // child: Column( + // crossAxisAlignment: CrossAxisAlignment.start, + // children: [ + // Text( + // TranslationBase.of(context).OrderStatus, + // style: TextStyle( + // fontSize: 13, + // fontWeight: FontWeight.w600, + // letterSpacing: -0.45, + // ), + // ), + // SizedBox( + // height: 4, + // ), + // Text( + // projectViewModel.isArabic ? order.descriptionN : order.description, + // style: TextStyle( + // fontSize: 18, + // fontWeight: FontWeight.w600, + // letterSpacing: -0.45, + // ), + // ), + // ], + // ), + // ), + // Container( + // width: double.infinity, + // padding: EdgeInsets.only(left: 15, bottom: 15, top: 15, right: 15), + // decoration: BoxDecoration( + // border: Border( + // bottom: BorderSide( + // color: Colors.grey, + // width: 1.0, + // ), + // ), + // // borderRadius: BorderRadius.circular(12), + // ), + // child: Column( + // crossAxisAlignment: CrossAxisAlignment.start, + // children: [ + // Text( + // TranslationBase.of(context).pickupDate, + // style: TextStyle( + // fontSize: 13, + // fontWeight: FontWeight.w600, + // letterSpacing: -0.45, + // ), + // ), + // SizedBox( + // height: 4, + // ), + // Text( + // DateUtil.getDayMonthYearDateFormatted(DateUtil.convertStringToDate(order.createdOn)), + // style: TextStyle( + // fontSize: 18, + // fontWeight: FontWeight.w600, + // letterSpacing: -0.45, + // ), + // ), + // ], + // ), + // ), + // Container( + // width: double.infinity, + // clipBehavior: Clip.antiAlias, + // padding: EdgeInsets.only(left: 15, bottom: 15, top: 15, right: 15), + // decoration: BoxDecoration( + // border: Border( + // bottom: BorderSide( + // color: (order.status == 1 || order.status == 2) ? Colors.grey : Colors.transparent, + // width: (order.status == 1 || order.status == 2) ? 1.0 : 0, + // ), + // ), + // // borderRadius: BorderRadius.circular(12), + // ), + // child: Column( + // crossAxisAlignment: CrossAxisAlignment.start, + // children: [ + // Text( + // TranslationBase.of(context).orderLocation, + // style: TextStyle( + // fontSize: 13, + // fontWeight: FontWeight.w600, + // letterSpacing: -0.45, + // ), + // ), + // SizedBox( + // height: 4, + // ), + // Text( + // !projectViewModel.isArabic ? order.projectDescription.toString() : order.projectDescriptionN.toString(), + // style: TextStyle( + // fontSize: 13, + // fontWeight: FontWeight.w600, + // letterSpacing: -0.45, + // ), + // ), + // ], + // ), + // ), + // (order.status == 1 || order.status == 2) + // ? SizedBox( + // height: 12, + // ) + // : Container(), + // if (order.status == 1 || order.status == 2) + // Center( + // child: Container( + // width: MediaQuery.of(context).size.width * 0.85, + // child: SecondaryButton( + // label: TranslationBase.of(context).cancel.toUpperCase(), + // onTap: () { + // showConfirmMessage(model, order); + // }, + // color: Colors.red[800], + // disabled: false, + // textColor: Theme.of(context).backgroundColor), + // ), + // ), + // (order.status == 1 || order.status == 2) + // ? SizedBox( + // height: 12, + // ) + // : SizedBox( + // height: 2, + // ), + // ], + // ), + // ); + // }).toList()) + // ], + // ), + // ), + // ), + // ), + // ), ); } } diff --git a/lib/pages/landing/fragments/home_page_fragment2.dart b/lib/pages/landing/fragments/home_page_fragment2.dart index b56ea43f..669e14f9 100644 --- a/lib/pages/landing/fragments/home_page_fragment2.dart +++ b/lib/pages/landing/fragments/home_page_fragment2.dart @@ -79,7 +79,7 @@ class _HomePageFragment2State extends State { padding: const EdgeInsets.only(left: 20, right: 20, top: 8, bottom: 6), child: InkWell( onTap: () { - navigateTo(context, MedicalProfilePageNew()); + widget.onMedicalFileClick(); }, child: LoggedSliderView( projectViewModel,