Merge branch 'mirza_home_page' into development_new_design_2.0

# Conflicts:
#	lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/new_Home_health_care_step_one_page.dart
#	lib/pages/AlHabibMedicalService/HomeHealthCare/orders_log_details_page.dart
merge-update-with-lab-changes
Mirza.Shafique 4 years ago
commit d3698a0e74

@ -13,7 +13,10 @@ Future<void> showCMCConfirmDialog(BuildContext context, String requestId, {Funct
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
ConfirmDialog(requestId,onClick: onClick,),
ConfirmDialog(
requestId,
onClick: onClick,
),
],
),
);
@ -36,7 +39,16 @@ class ConfirmDialog extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.start,
children: [
Container(
width: 40,
height: 40,
margin: EdgeInsets.only(top: 20),
decoration: containerRadius(CustomColors.green, 200,),
child: Icon(Icons.done,color: Colors.white,),
),
mFlex(1),
IconButton(
icon: Icon(
@ -49,6 +61,7 @@ class ConfirmDialog extends StatelessWidget {
),
],
),
mHeight(12),
Text(
TranslationBase.of(context).RRTRequestSuccess,
textAlign: TextAlign.start,

@ -51,6 +51,7 @@ class _NewHomeHealthCareStepOnePageState extends State<NewHomeHealthCareStepOneP
padding: EdgeInsets.only(left: 21, right: 21, top: 12, bottom: 12),
itemBuilder: (context, index) {
HHCGetAllServicesResponseModel service = widget.model.hhcAllServicesList[index];
return Padding(
padding: const EdgeInsets.only(top: 4, bottom: 4),
child: Row(
@ -94,8 +95,7 @@ class _NewHomeHealthCareStepOnePageState extends State<NewHomeHealthCareStepOneP
),
Container(
color: Colors.white,
padding: EdgeInsets.only(top: 0, bottom: 16, right: 21, left: 21),
margin: EdgeInsets.only(bottom: 50.0),
padding: EdgeInsets.all(16),
child: DefaultButton(
TranslationBase.of(context).next,
(this.widget.patientERInsertPresOrderRequestModel.patientERHHCInsertServicesList.length == 0 || widget.model.state == ViewState.BusyLocal)

@ -10,6 +10,7 @@ import 'package:diplomaticquarterapp/theme/colors.dart';
import 'package:diplomaticquarterapp/uitl/app_toast.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/data_display/text.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
@ -85,17 +86,23 @@ class _NewHomeHealthCareStepThreePageState extends State<NewHomeHealthCareStepTh
)),
Container(
decoration: BoxDecoration(color: Colors.white, borderRadius: BorderRadius.circular(12)),
padding: EdgeInsets.all(8),
padding: EdgeInsets.all(12),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Texts(TranslationBase.of(context).selectedLocation, fontWeight: FontWeight.bold),
Text(
TranslationBase.of(context).selectedLocation,
style: TextStyle(
fontSize: 14,
fontWeight: FontWeight.w600,
color: CustomColors.textColor,
letterSpacing: -0.56,
),
),
SizedBox(
height: 12,
),
Padding(
padding: const EdgeInsets.all(8.0),
child: Container(
Container(
height: 200,
// child: GoogleMap(
// mapType: MapType.normal,
@ -105,6 +112,8 @@ class _NewHomeHealthCareStepThreePageState extends State<NewHomeHealthCareStepTh
// _controller.complete(controller);
// },
// ),
decoration: containerColorRadiusBorderWidth(Colors.transparent, 12,Colors.transparent,0.5),
clipBehavior: Clip.antiAlias,
child: Image.network(
"https://maps.googleapis.com/maps/api/staticmap?center=" +
widget.patientERInsertPresOrderRequestModel.latitude.toString() +
@ -119,11 +128,18 @@ class _NewHomeHealthCareStepThreePageState extends State<NewHomeHealthCareStepTh
height: double.infinity,
fit: BoxFit.cover,
)),
),
SizedBox(
height: 12,
),
Texts(TranslationBase.of(context).selectedService),
Text(
TranslationBase.of(context).selectedService,
style: TextStyle(
fontSize: 14,
fontWeight: FontWeight.w600,
color: CustomColors.textColor,
letterSpacing: -0.56,
),
),
...List.generate(
widget.patientERInsertPresOrderRequestModel.patientERHHCInsertServicesList.length,
(index) => Container(
@ -139,13 +155,23 @@ class _NewHomeHealthCareStepThreePageState extends State<NewHomeHealthCareStepTh
),
Row(
children: [
Texts(
Text(
(index + 1).toString() + '. ',
fontSize: 15,
style: TextStyle(
fontSize: 12,
fontWeight: FontWeight.w600,
color: CustomColors.black,
letterSpacing: -0.48,
),
Texts(
),
Text(
widget.patientERInsertPresOrderRequestModel.patientERHHCInsertServicesList[index].serviceName,
fontSize: 15,
style: TextStyle(
fontSize: 12,
fontWeight: FontWeight.w600,
color: CustomColors.black,
letterSpacing: -0.48,
),
),
],
)

@ -1,5 +1,4 @@
import 'package:diplomaticquarterapp/core/enum/viewstate.dart';
import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/ComprehensiveMedicalCheckup/GetCMCAllOrdersResponseModel.dart';
import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/HomeHealthCare/get_hhc_all_pres_orders_response_model.dart';
import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/HomeHealthCare/update_pres_oreder_request_model.dart';
import 'package:diplomaticquarterapp/core/viewModels/AlHabibMedicalService/home_health_care_view_model.dart';
@ -25,7 +24,7 @@ class OrdersLogDetailsPage extends StatelessWidget {
Widget build(BuildContext context) {
ProjectViewModel projectViewModel = Provider.of(context);
void showConfirmMessage(HomeHealthCareViewModel model, GetCMCAllOrdersResponseModel order) {
void showConfirmMessage(HomeHealthCareViewModel model, GetHHCAllPresOrdersResponseModel order) {
showDialog(
context: context,
child: ConfirmWithMessageDialog(
@ -76,10 +75,10 @@ class OrdersLogDetailsPage extends StatelessWidget {
padding: EdgeInsets.all(21),
physics: BouncingScrollPhysics(),
itemBuilder: (context, index) {
GetCMCAllOrdersResponseModel order = model.hhcAllPresOrders[index];
GetHHCAllPresOrdersResponseModel order = model.hhcAllPresOrders[index];
int status = order.statusId;
String _statusDisp = order.statusText;
int status = order.status;
String _statusDisp = projectViewModel.isArabic ? order.descriptionN : order.description;
Color _color;
if (status == 1) {
//pending
@ -163,11 +162,11 @@ class OrdersLogDetailsPage extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.end,
children: [
Text(
DateUtil.getDayMonthYearDateFormatted(DateTime.tryParse(order.created)),
DateUtil.getDayMonthYearDateFormatted(DateUtil.convertStringToDate(order.createdOn)),
style: TextStyle(fontSize: 12, fontWeight: FontWeight.w600, color: Color(0xff2B353E), letterSpacing: -0.4, height: 16 / 10),
),
SizedBox(height: 12),
if (order.statusId == 1 || order.statusId == 2)
if (order.status == 1 || order.status == 2)
InkWell(
onTap: () {
showConfirmMessage(model, order);

@ -15,6 +15,7 @@ import 'package:diplomaticquarterapp/pages/landing/widgets/slider_view.dart';
import 'package:diplomaticquarterapp/pages/medical/medical_profile_page_new.dart';
import 'package:diplomaticquarterapp/pages/packages_offers/OfferAndPackagesPage.dart';
import 'package:diplomaticquarterapp/theme/colors.dart';
import 'package:diplomaticquarterapp/uitl/app_toast.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/uitl/utils.dart';
import 'package:diplomaticquarterapp/uitl/utils_new.dart';
@ -282,6 +283,7 @@ class _HomePageFragment2State extends State<HomePageFragment2> {
child: InkWell(
onTap: () {
Navigator.of(context).push(MaterialPageRoute(builder: (context) => PackagesHomePage()));
},
child: Container(
width: double.infinity,

@ -5,6 +5,7 @@ class CustomColors {
static const Color purple = Color(0xFF6002EE);
static const Color deepPurple = Color(0xFF3900B1);
static const Color grey = Color(0xFF848484);
static const Color textColor = Color(0xFF575757);
static const Color grey2 = Color(0xFFA5A5A5);
static const Color darkGrey = Color(0xFF222222);
static const Color black = Color(0xFF141414);

@ -252,7 +252,17 @@ class NewAppBarWidget extends StatelessWidget with PreferredSizeWidget {
],
),
actions: <Widget>[
if (appBarIcons != null) ...appBarIcons,
if (appBarIcons != null) ...appBarIcons else
IconButton(
onPressed: () {
Navigator.pushAndRemoveUntil(
context,
MaterialPageRoute(builder: (context) => LandingPage()),
(Route<dynamic> route) => false,
);
},
icon: Icon(Icons.home),
),
],
);
}

Loading…
Cancel
Save