mousa and hussam branch

merge-update-with-lab-changes
hussam al-habibeh 5 years ago
parent a1906a4072
commit 5dc3c53550

@ -134,8 +134,6 @@ const GET_CLINICS_LIST_URL = "Services/lists.svc/REST/GetClinicCentralized";
const GET_ACTIVE_APPOINTMENTS_LIST_URL = const GET_ACTIVE_APPOINTMENTS_LIST_URL =
"Services/Doctors.svc/Rest/Dr_GetAppointmentActiveNumber"; "Services/Doctors.svc/Rest/Dr_GetAppointmentActiveNumber";
//URL to get projects list //URL to get projects list
const GET_PROJECTS_LIST = 'Services/Lists.svc/REST/GetProject'; const GET_PROJECTS_LIST = 'Services/Lists.svc/REST/GetProject';
@ -372,15 +370,23 @@ const GET_ADDRESS = "epharmacy/api/Customers/272843?fields=addresses";
const GET_SHOPPING_CART = "epharmacy/api/shopping_cart_items/"; const GET_SHOPPING_CART = "epharmacy/api/shopping_cart_items/";
const GET_SHIPPING_OPTIONS = "epharmacy/api/get_shipping_option/"; const GET_SHIPPING_OPTIONS = "epharmacy/api/get_shipping_option/";
const DELETE_SHOPPING_CART = "epharmacy/api/delete_shopping_cart_items/"; const DELETE_SHOPPING_CART = "epharmacy/api/delete_shopping_cart_items/";
const DELETE_SHOPPING_CART_ALL = "epharmacy/api/delete_shopping_cart_item_by_customer/"; const DELETE_SHOPPING_CART_ALL =
"epharmacy/api/delete_shopping_cart_item_by_customer/";
const ORDER_SHOPPING_CART = "epharmacy/api/orders"; const ORDER_SHOPPING_CART = "epharmacy/api/orders";
const GET_LACUM_ACCOUNT_INFORMATION = "Services/Patients.svc/REST/GetLakumAccountInformation"; const GET_LACUM_ACCOUNT_INFORMATION =
const GET_LACUM_GROUP_INFORMATION = "Services/Patients.svc/REST/GetlakumInQueryInfoGrouping"; "Services/Patients.svc/REST/GetLakumAccountInformation";
const LACUM_ACCOUNT_ACTIVATE = "Services/Patients.svc/REST/LakumAccountActivation"; const GET_LACUM_GROUP_INFORMATION =
const LACUM_ACCOUNT_DEACTIVATE = "Services/Patients.svc/REST/LakumAccountDeactivation"; "Services/Patients.svc/REST/GetlakumInQueryInfoGrouping";
const CREATE_LAKUM_ACCOUNT = "Services/Patients.svc/REST/PHR_CreateLakumAccount"; const LACUM_ACCOUNT_ACTIVATE =
const TRANSFER_YAHALA_LOYALITY_POINTS = "Services/Patients.svc/REST/TransferYaHalaLoyaltyPoints"; "Services/Patients.svc/REST/LakumAccountActivation";
const LAKUM_GET_USER_TERMS_AND_CONDITIONS = "Services/ERP.svc/REST/GetUserTermsAndConditionsForEPharmcy"; const LACUM_ACCOUNT_DEACTIVATE =
"Services/Patients.svc/REST/LakumAccountDeactivation";
const CREATE_LAKUM_ACCOUNT =
"Services/Patients.svc/REST/PHR_CreateLakumAccount";
const TRANSFER_YAHALA_LOYALITY_POINTS =
"Services/Patients.svc/REST/TransferYaHalaLoyaltyPoints";
const LAKUM_GET_USER_TERMS_AND_CONDITIONS =
"Services/ERP.svc/REST/GetUserTermsAndConditionsForEPharmcy";
// Home Health Care // Home Health Care
const HHC_GET_ALL_SERVICES = const HHC_GET_ALL_SERVICES =

@ -174,7 +174,6 @@ void setupLocator() {
locator.registerLazySingleton(() => CustomerAddressesService()); locator.registerLazySingleton(() => CustomerAddressesService());
locator.registerLazySingleton(() => TermsConditionService()); locator.registerLazySingleton(() => TermsConditionService());
/// View Model /// View Model
locator.registerFactory(() => HospitalViewModel()); locator.registerFactory(() => HospitalViewModel());
locator.registerFactory(() => PharmacyViewModel()); locator.registerFactory(() => PharmacyViewModel());
@ -208,7 +207,6 @@ void setupLocator() {
locator.registerFactory(() => PharmacyAddressesViewModel()); locator.registerFactory(() => PharmacyAddressesViewModel());
locator.registerFactory(() => TermsConditionViewModel()); locator.registerFactory(() => TermsConditionViewModel());
locator.registerFactory(() => AddNewChildViewModel()); locator.registerFactory(() => AddNewChildViewModel());
locator.registerFactory(() => H2OViewModel()); locator.registerFactory(() => H2OViewModel());
locator.registerFactory(() => BloodSugarViewMode()); locator.registerFactory(() => BloodSugarViewMode());
@ -223,7 +221,6 @@ void setupLocator() {
locator.registerFactory(() => CMCViewModel()); locator.registerFactory(() => CMCViewModel());
locator.registerFactory(() => NotificationViewModel()); locator.registerFactory(() => NotificationViewModel());
locator.registerFactory(() => PharmacyModuleViewModel()); locator.registerFactory(() => PharmacyModuleViewModel());
locator.registerFactory(() => OrderPreviewViewModel()); locator.registerFactory(() => OrderPreviewViewModel());
locator.registerFactory(() => LacumViewModel()); locator.registerFactory(() => LacumViewModel());

@ -490,9 +490,6 @@ class _HomePageState extends State<HomePage> {
opacity: 0.5, opacity: 0.5,
), ),
DashboardItem( DashboardItem(
onTap: () => Navigator.push(
context, FadePage(page: PharmacyPage())),
child: Center( child: Center(
child: Padding( child: Padding(
padding: const EdgeInsets.all(15.0), padding: const EdgeInsets.all(15.0),

@ -1,5 +1,7 @@
import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
import 'package:diplomaticquarterapp/pages/parent_categorise_page.dart'; import 'package:diplomaticquarterapp/pages/parent_categorise_page.dart';
import 'package:diplomaticquarterapp/pages/pharmacies/screens/cart-order-page.dart';
import 'package:diplomaticquarterapp/pages/pharmacies/screens/pharmacy_module_page.dart';
import 'package:diplomaticquarterapp/pages/pharmacy_categorise.dart'; import 'package:diplomaticquarterapp/pages/pharmacy_categorise.dart';
import 'package:diplomaticquarterapp/pages/search_products_page.dart'; import 'package:diplomaticquarterapp/pages/search_products_page.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
@ -95,51 +97,49 @@ class _LandingPagePharmacyState extends State<LandingPagePharmacy> {
], ],
centerTitle: true, centerTitle: true,
) )
: AppBar( : currentTab == 4
backgroundColor: Color(0xff5AB145), ? null
elevation: 0, : AppBar(
textTheme: TextTheme( backgroundColor: Color(0xff5AB145),
headline6: elevation: 0,
TextStyle(color: Colors.white, fontWeight: FontWeight.bold), textTheme: TextTheme(
), headline6: TextStyle(
title: Text(getText(currentTab).toUpperCase()), color: Colors.white, fontWeight: FontWeight.bold),
leading: Builder( ),
builder: (BuildContext context) { title: Text(getText(currentTab).toUpperCase()),
return IconButton( leading: Builder(
icon: Icon(Icons.arrow_back), builder: (BuildContext context) {
color: Colors.white, return IconButton(
onPressed: () => Scaffold.of(context).openDrawer(), icon: Icon(Icons.arrow_back),
); color: Colors.white,
}, onPressed: () => Scaffold.of(context).openDrawer(),
), );
actions: [ },
// IconButton( ),
// iconSize: 70, actions: [
// icon: SvgPicture.asset('assets/images/svg/robort_svg.svg', // IconButton(
// height: 100, width: 100, fit: BoxFit.cover), // iconSize: 70,
// onPressed: () { // icon: SvgPicture.asset('assets/images/svg/robort_svg.svg',
// triggerRobot(); // height: 100, width: 100, fit: BoxFit.cover),
// } //do something, // onPressed: () {
// ) // triggerRobot();
], // } //do something,
centerTitle: true, // )
), ],
centerTitle: true,
),
extendBody: false, extendBody: false,
body: PageView( body: PageView(
physics: NeverScrollableScrollPhysics(), physics: NeverScrollableScrollPhysics(),
controller: pageController, controller: pageController,
children: [ children: [
Container( PharmacyPage(),
child: Text('text'),
),
PharmacyCategorisePage(), PharmacyCategorisePage(),
OffersCategorisePage(), OffersCategorisePage(),
Container( Container(
child: Text('text'), child: Text('text'),
), ),
Container( CartOrderPage(),
child: Center(child: Text('This Is Cart Page')),
),
], // Please do not remove the BookingOptions from this array ], // Please do not remove the BookingOptions from this array
), ),
bottomNavigationBar: BottomNavPharmacyBar( bottomNavigationBar: BottomNavPharmacyBar(

@ -3,6 +3,7 @@ import 'package:diplomaticquarterapp/core/viewModels/offers_Categorise_view_mode
import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
import 'package:diplomaticquarterapp/widgets/others/StarRating.dart'; import 'package:diplomaticquarterapp/widgets/others/StarRating.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_pharmacy_widget.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:diplomaticquarterapp/widgets/others/network_base_view.dart'; import 'package:diplomaticquarterapp/widgets/others/network_base_view.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@ -32,9 +33,9 @@ class _OffersCategorisePageState extends State<OffersCategorisePage> {
onModelReady: (model) => model.getOffersCategorise(), onModelReady: (model) => model.getOffersCategorise(),
builder: (BuildContext context, OffersCategoriseViewModel model, builder: (BuildContext context, OffersCategoriseViewModel model,
Widget child) => Widget child) =>
AppScaffold( PharmacyAppScaffold(
appBarTitle: 'Offers', appBarTitle: 'Offers',
isShowAppBar: false, isShowAppBar: true,
backgroundColor: Colors.white, backgroundColor: Colors.white,
isShowDecPage: false, isShowDecPage: false,
baseViewModel: model, baseViewModel: model,

@ -2,6 +2,7 @@ import 'package:diplomaticquarterapp/config/size_config.dart';
import 'package:diplomaticquarterapp/core/viewModels/pharmacyModule/pharmacy_module_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/pharmacyModule/pharmacy_module_view_model.dart';
import 'package:diplomaticquarterapp/pages/base/base_view.dart'; import 'package:diplomaticquarterapp/pages/base/base_view.dart';
import 'package:diplomaticquarterapp/pages/landing/home_page.dart'; import 'package:diplomaticquarterapp/pages/landing/home_page.dart';
import 'package:diplomaticquarterapp/pages/offers_categorise_page.dart';
import 'package:diplomaticquarterapp/pages/pharmacies/screens/cart-order-page.dart'; import 'package:diplomaticquarterapp/pages/pharmacies/screens/cart-order-page.dart';
import 'package:diplomaticquarterapp/pages/pharmacies/screens/lakum-main-page.dart'; import 'package:diplomaticquarterapp/pages/pharmacies/screens/lakum-main-page.dart';
import 'package:diplomaticquarterapp/pages/pharmacies/widgets/BannerPager.dart'; import 'package:diplomaticquarterapp/pages/pharmacies/widgets/BannerPager.dart';
@ -24,7 +25,7 @@ class PharmacyPage extends StatelessWidget {
allowAny: true, allowAny: true,
builder: (_, model, wi) => AppScaffold( builder: (_, model, wi) => AppScaffold(
title: "", title: "",
isShowAppBar: true, isShowAppBar: false,
isShowDecPage: false, isShowDecPage: false,
baseViewModel: model, baseViewModel: model,
backgroundColor: Colors.white, backgroundColor: Colors.white,
@ -164,7 +165,7 @@ class GridViewButtons extends StatelessWidget {
child: GridViewCard( child: GridViewCard(
TranslationBase.of(context).offersAndPromotions, TranslationBase.of(context).offersAndPromotions,
'assets/images/pharmacy_module/offer_icon.png', () { 'assets/images/pharmacy_module/offer_icon.png', () {
Navigator.push(context, FadePage(page: CartOrderPage())); Navigator.push(context, FadePage(page: OffersCategorisePage()));
}), }),
), ),
DashboardItem( DashboardItem(

@ -763,19 +763,17 @@ class TranslationBase {
String get orderLog => localizedValues['OrderLog'][locale.languageCode]; String get orderLog => localizedValues['OrderLog'][locale.languageCode];
// String get infoLab => localizedValues['info-lab'][locale.languageCode]; // String get infoLab => localizedValues['info-lab'][locale.languageCode];
// String get infoRadiology => // String get infoRadiology =>
localizedValues['info-radiology'][locale.languageCode];
String get orderNumber => localizedValues['orderNumber'][locale.languageCode]; String get orderNumber => localizedValues['orderNumber'][locale.languageCode];
String get orderDate => localizedValues['orderDate'][locale.languageCode]; String get orderDate => localizedValues['orderDate'][locale.languageCode];
String get itemsNo => localizedValues['itemsNo'][locale.languageCode]; String get itemsNo => localizedValues['itemsNo'][locale.languageCode];
String get noOrder => localizedValues['noOrder'][locale.languageCode]; String get noOrder => localizedValues['noOrder'][locale.languageCode];
// pharmacy module // pharmacy module
// String get medicationRefill =>
localizedValues['medicationRefill'][locale.languageCode];
String get offersAndPromotions => String get offersAndPromotions =>
localizedValues['offersAndPromotions'][locale.languageCode]; localizedValues['offersAndPromotions'][locale.languageCode];
// String get myPrescriptions =>
localizedValues['myPrescriptions'][locale.languageCode];
String get searchAndScanMedication => String get searchAndScanMedication =>
localizedValues['searchAndScanMedication'][locale.languageCode]; localizedValues['searchAndScanMedication'][locale.languageCode];
String get shopByBrands => String get shopByBrands =>
@ -1029,8 +1027,10 @@ class TranslationBase {
String get month => localizedValues['Month'][locale.languageCode]; String get month => localizedValues['Month'][locale.languageCode];
String get point => localizedValues['point'][locale.languageCode]; String get point => localizedValues['point'][locale.languageCode];
String get riyal => localizedValues['riyal'][locale.languageCode]; String get riyal => localizedValues['riyal'][locale.languageCode];
String get termOfService => localizedValues['termOfService'][locale.languageCode]; String get termOfService =>
String get shoppingCart => localizedValues['shoppingCart'][locale.languageCode]; localizedValues['termOfService'][locale.languageCode];
String get shoppingCart =>
localizedValues['shoppingCart'][locale.languageCode];
String get referralStatus => String get referralStatus =>
localizedValues['referralStatus'][locale.languageCode]; localizedValues['referralStatus'][locale.languageCode];

Loading…
Cancel
Save