Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development

# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
merge-update-with-lab-changes
haroon amjad 5 years ago
commit ed3dba3eb3

@ -13,7 +13,7 @@ const PACKAGES_CATEGORIES = '/api/categories';
const PACKAGES_PRODUCTS = '/api/products'; const PACKAGES_PRODUCTS = '/api/products';
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/';
//const BASE_PHARMACY_URL = 'http://swd-pharapp-01:7200/api/'; //const BASE_PHARMACY_URL = 'http://swd-pharapp-01:7200/api/';
const BASE_PHARMACY_URL = 'https://uat.hmgwebservices.com/epharmacy/api/'; const BASE_PHARMACY_URL = 'https://uat.hmgwebservices.com/epharmacy/api/';
@ -91,6 +91,11 @@ const GET_PATIENT_VITAL_SIGN =
const GET_NEAREST_HOSPITAL = const GET_NEAREST_HOSPITAL =
'Services/Patients.svc/REST/Patient_GetProjectAvgERWaitingTime'; 'Services/Patients.svc/REST/Patient_GetProjectAvgERWaitingTime';
///ED Online
const ER_GET_VISUAL_TRIAGE_QUESTIONS = "services/Doctors.svc/REST/ER_GetVisualTriageQuestions";
const ER_SAVE_TRIAGE_INFORMATION = "services/Doctors.svc/REST/ER_SaveTriageInformation";
const ER_GetPatientPaymentInformationForERClinic = "services/Doctors.svc/REST/ER_GetPatientPaymentInformationForERClinic";
///Er Nearest ///Er Nearest
const GET_AMBULANCE_REQUEST = const GET_AMBULANCE_REQUEST =
'Services/Patients.svc/REST/PatientER_RRT_GetAllTransportationMethod'; 'Services/Patients.svc/REST/PatientER_RRT_GetAllTransportationMethod';
@ -435,6 +440,11 @@ const GET_ALL_CITIES = 'services/Lists.svc/rest/GetAllCities';
const CREATE_E_REFERRAL = "Services/Patients.svc/REST/CreateEReferral"; const CREATE_E_REFERRAL = "Services/Patients.svc/REST/CreateEReferral";
const GET_E_REFERRALS = "Services/Patients.svc/REST/GetEReferrals"; const GET_E_REFERRALS = "Services/Patients.svc/REST/GetEReferrals";
// Encillary Orders
const GET_ANCILLARY_ORDERS =
'Services/Doctors.svc/REST/GetOnlineAncillaryOrderList';
//Pharmacy wishlist //Pharmacy wishlist
// const GET_WISHLIST = "http://swd-pharapp-01:7200/api/shopping_cart_items/"; // const GET_WISHLIST = "http://swd-pharapp-01:7200/api/shopping_cart_items/";
@ -555,6 +565,8 @@ const GET_SEARCH_PRODUCTS =
const SCAN_QR_CODE = 'productbysku/'; const SCAN_QR_CODE = 'productbysku/';
const FILTERED_PRODUCTS = 'products?categoryids=';
class AppGlobal { class AppGlobal {
static var context; static var context;

@ -1958,4 +1958,13 @@ const Map localizedValues = {
"en": "Your session has timed out, Please try again", "en": "Your session has timed out, Please try again",
"ar": "انتهت مهلة جلسة الخاص بها. يرجى المحاولة مرة أخرى" "ar": "انتهت مهلة جلسة الخاص بها. يرجى المحاولة مرة أخرى"
}, },
"ancillary-orders": {"en": "Ancillary Orders", "ar": "الأوامر التبعية"},
"onlineCheckInAgreement": {"en": "The online check-in is for non-life threatening situationCall the red crescent (number) or go to the nearest emergency department if there are:signs of stroke or heart attack history of seizure or syncope there is limb or life threatening injury picture of severe injuries",
"ar": "تسجيل الذهاب الى الطوارئ عبر الإنترنت هو فقط للحالات  التي لا تهدد الحياة يجب الاتصل بالهلال الأحمر (رقم) أو الذهاب إلى أقرب قسم طوارئ إذا كان هناك علامات السكتة الدماغية أو النوبة القلبية او هناك نوبة تشنج او حالة فقدان الوعي او وجود إصابة تهدد أحد الأطراف او تهدد الحياة او وجود إصابات خطيرة"},
"chiefComplaints": {"en": "Chief Complaints", "ar": "الشكوى الرئيسة"},
"errorChiefComplaints": {"en": "Please Chief Complaints", "ar": "يرجى ادخال الشكوى الرئيسة"},
"errorExpectedArrivalTimes": {"en": "Please Expected arrival time", "ar": "يرجى ادخال الوقت المتوقع للوصول"},
"expectedArrivalTime": {"en": "Expected arrival time", "ar": "الوقت المتوقع للوصول"},
}; };

@ -0,0 +1,92 @@
class ErPatientShareModel {
int cashPrice;
int cashPriceTax;
int cashPriceWithTax;
int companyId;
String companyName;
int companyShareWithTax;
dynamic errCode;
int groupID;
dynamic insurancePolicyNo;
String message;
dynamic patientCardID;
double patientShare;
double patientShareWithTax;
double patientTaxAmount;
int policyId;
String policyName;
String procedureName;
dynamic setupID;
int statusCode;
dynamic subPolicyNo;
ErPatientShareModel(
{this.cashPrice,
this.cashPriceTax,
this.cashPriceWithTax,
this.companyId,
this.companyName,
this.companyShareWithTax,
this.errCode,
this.groupID,
this.insurancePolicyNo,
this.message,
this.patientCardID,
this.patientShare,
this.patientShareWithTax,
this.patientTaxAmount,
this.policyId,
this.policyName,
this.procedureName,
this.setupID,
this.statusCode,
this.subPolicyNo});
ErPatientShareModel.fromJson(Map<String, dynamic> json) {
cashPrice = json['CashPrice'];
cashPriceTax = json['CashPriceTax'];
cashPriceWithTax = json['CashPriceWithTax'];
companyId = json['CompanyId'];
companyName = json['CompanyName'];
companyShareWithTax = json['CompanyShareWithTax'];
errCode = json['ErrCode'];
groupID = json['GroupID'];
insurancePolicyNo = json['InsurancePolicyNo'];
message = json['Message'];
patientCardID = json['PatientCardID'];
patientShare = json['PatientShare'];
patientShareWithTax = json['PatientShareWithTax'];
patientTaxAmount = json['PatientTaxAmount'];
policyId = json['PolicyId'];
policyName = json['PolicyName'];
procedureName = json['ProcedureName'];
setupID = json['SetupID'];
statusCode = json['StatusCode'];
subPolicyNo = json['SubPolicyNo'];
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['CashPrice'] = this.cashPrice;
data['CashPriceTax'] = this.cashPriceTax;
data['CashPriceWithTax'] = this.cashPriceWithTax;
data['CompanyId'] = this.companyId;
data['CompanyName'] = this.companyName;
data['CompanyShareWithTax'] = this.companyShareWithTax;
data['ErrCode'] = this.errCode;
data['GroupID'] = this.groupID;
data['InsurancePolicyNo'] = this.insurancePolicyNo;
data['Message'] = this.message;
data['PatientCardID'] = this.patientCardID;
data['PatientShare'] = this.patientShare;
data['PatientShareWithTax'] = this.patientShareWithTax;
data['PatientTaxAmount'] = this.patientTaxAmount;
data['PolicyId'] = this.policyId;
data['PolicyName'] = this.policyName;
data['ProcedureName'] = this.procedureName;
data['SetupID'] = this.setupID;
data['StatusCode'] = this.statusCode;
data['SubPolicyNo'] = this.subPolicyNo;
return data;
}
}

@ -0,0 +1,147 @@
import 'package:diplomaticquarterapp/core/model/hospitals/hospitals_model.dart';
class TriageInformationRequest {
double versionID;
int channel;
int languageID;
String iPAdress;
String sessionID;
int patientID;
String tokenID;
String generalid;
int patientOutSA;
int patientTypeID;
int patientType;
int projectID;
ERTriageInformation eRTriageInformation;
HospitalsModel selectedHospital;
TriageInformationRequest(
{this.versionID,
this.channel,
this.languageID,
this.iPAdress,
this.sessionID,
this.patientID,
this.tokenID,
this.generalid,
this.patientOutSA,
this.patientTypeID,
this.patientType,
this.projectID,
this.eRTriageInformation,this.selectedHospital});
TriageInformationRequest.fromJson(Map<String, dynamic> json) {
versionID = json['VersionID'];
channel = json['Channel'];
languageID = json['LanguageID'];
iPAdress = json['IPAdress'];
sessionID = json['SessionID'];
patientID = json['PatientID'];
tokenID = json['TokenID'];
generalid = json['generalid'];
patientOutSA = json['PatientOutSA'];
patientTypeID = json['PatientTypeID'];
patientType = json['PatientType'];
projectID = json['ProjectID'];
eRTriageInformation = json['ERTriageInformation'] != null
? new ERTriageInformation.fromJson(json['ERTriageInformation'])
: null;
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['VersionID'] = this.versionID;
data['Channel'] = this.channel;
data['LanguageID'] = this.languageID;
data['IPAdress'] = this.iPAdress;
data['SessionID'] = this.sessionID;
data['PatientID'] = this.patientID;
data['TokenID'] = this.tokenID;
data['generalid'] = this.generalid;
data['PatientOutSA'] = this.patientOutSA;
data['PatientTypeID'] = this.patientTypeID;
data['PatientType'] = this.patientType;
data['ProjectID'] = this.projectID;
if (this.eRTriageInformation != null) {
data['ERTriageInformation'] = this.eRTriageInformation.toJson();
}
return data;
}
}
class ERTriageInformation {
String notes;
String chiefComplaint;
int patientId;
int projectId;
int riskScore;
List<Checklist> checklist;
ERTriageInformation(
{this.notes,
this.chiefComplaint,
this.patientId,
this.projectId,
this.riskScore,
this.checklist});
ERTriageInformation.fromJson(Map<String, dynamic> json) {
notes = json['Notes'];
chiefComplaint = json['ChiefComplaint'];
patientId = json['PatientId'];
projectId = json['ProjectId'];
riskScore = json['RiskScore'];
if (json['checklist'] != null) {
checklist = new List<Checklist>();
json['checklist'].forEach((v) {
checklist.add(new Checklist.fromJson(v));
});
}
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['Notes'] = this.notes;
data['ChiefComplaint'] = this.chiefComplaint;
data['PatientId'] = this.patientId;
data['ProjectId'] = this.projectId;
data['RiskScore'] = this.riskScore;
if (this.checklist != null) {
data['checklist'] = this.checklist.map((v) => v.toJson()).toList();
}
return data;
}
}
class Checklist {
int isSelected;
int parameterCode;
int parameterGroup;
int parameterType;
int score;
Checklist(
{this.isSelected,
this.parameterCode,
this.parameterGroup,
this.parameterType,
this.score});
Checklist.fromJson(Map<String, dynamic> json) {
isSelected = json['IsSelected'];
parameterCode = json['ParameterCode'];
parameterGroup = json['ParameterGroup'];
parameterType = json['ParameterType'];
score = json['Score'];
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['IsSelected'] = this.isSelected;
data['ParameterCode'] = this.parameterCode;
data['ParameterGroup'] = this.parameterGroup;
data['ParameterType'] = this.parameterType;
data['Score'] = this.score;
return data;
}
}

@ -0,0 +1,52 @@
class TriageQuestionsModel {
String adultPoints;
String headerSequence;
int parameterCode;
int parameterGroup;
int parameterType;
String pediaPoints;
String question;
String questionN;
String scoreGroup;
String titles;
TriageQuestionsModel(
{this.adultPoints,
this.headerSequence,
this.parameterCode,
this.parameterGroup,
this.parameterType,
this.pediaPoints,
this.question,
this.questionN,
this.scoreGroup,
this.titles});
TriageQuestionsModel.fromJson(Map<String, dynamic> json) {
adultPoints = json['AdultPoints'];
headerSequence = json['HeaderSequence'];
parameterCode = json['ParameterCode'];
parameterGroup = json['ParameterGroup'];
parameterType = json['ParameterType'];
pediaPoints = json['PediaPoints'];
question = json['Question'];
questionN = json['QuestionN'];
scoreGroup = json['ScoreGroup'];
titles = json['Titles'];
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['AdultPoints'] = this.adultPoints;
data['HeaderSequence'] = this.headerSequence;
data['ParameterCode'] = this.parameterCode;
data['ParameterGroup'] = this.parameterGroup;
data['ParameterType'] = this.parameterType;
data['PediaPoints'] = this.pediaPoints;
data['Question'] = this.question;
data['QuestionN'] = this.questionN;
data['ScoreGroup'] = this.scoreGroup;
data['Titles'] = this.titles;
return data;
}
}

@ -1,11 +1,11 @@
class HospitalsModel { class HospitalsModel {
String desciption; String desciption;
Null desciptionN; dynamic desciptionN;
dynamic iD; dynamic iD;
String legalName; String legalName;
String legalNameN; String legalNameN;
String name; String name;
Null nameN; dynamic nameN;
String phoneNumber; String phoneNumber;
String setupID; String setupID;
dynamic distanceInKilometers; dynamic distanceInKilometers;
@ -13,7 +13,7 @@ class HospitalsModel {
String latitude; String latitude;
String longitude; String longitude;
dynamic mainProjectID; dynamic mainProjectID;
Null projectOutSA; dynamic projectOutSA;
bool usingInDoctorApp; bool usingInDoctorApp;
HospitalsModel( HospitalsModel(

@ -4,29 +4,29 @@ import 'PharmacyImageObject.dart';
import 'Reviews.dart'; import 'Reviews.dart';
class PharmacyProduct { class PharmacyProduct {
String id; dynamic id;
bool visibleIndividually; bool visibleIndividually;
String name; dynamic name;
String namen; dynamic namen;
String shortDescription; dynamic shortDescription;
String shortDescriptionn; dynamic shortDescriptionn;
String fullDescription; dynamic fullDescription;
String fullDescriptionn; dynamic fullDescriptionn;
bool markasNew; bool markasNew;
bool showOnHomePage; bool showOnHomePage;
String metaKeywords; dynamic metaKeywords;
String metaDescription; dynamic metaDescription;
String metaTitle; dynamic metaTitle;
bool allowCustomerReviews; bool allowCustomerReviews;
int approvedRatingSum; int approvedRatingSum;
int notApprovedRatingSum; int notApprovedRatingSum;
int approvedTotalReviews; int approvedTotalReviews;
int notApprovedTotalReviews; int notApprovedTotalReviews;
String sku; dynamic sku;
bool isRx; bool isRx;
bool prescriptionRequired; bool prescriptionRequired;
String rxMessage; dynamic rxMessage;
String rxMessagen; dynamic rxMessagen;
String manufacturerPartNumber; String manufacturerPartNumber;
String gtin; String gtin;
bool isGiftCard; bool isGiftCard;
@ -115,7 +115,6 @@ class PharmacyProduct {
int vendorId; int vendorId;
String seName; String seName;
PharmacyProduct( PharmacyProduct(
{this.id, {this.id,
this.visibleIndividually, this.visibleIndividually,

@ -0,0 +1,24 @@
import 'package:diplomaticquarterapp/config/config.dart';
import 'package:diplomaticquarterapp/core/service/base_service.dart';
import 'package:diplomaticquarterapp/models/anicllary-orders/ancillary_order_list_model.dart';
class AncillaryOrdersService extends BaseService {
List<AncillaryOrdersListModel> _ancillaryLists = List();
List<AncillaryOrdersListModel> get ancillaryLists => _ancillaryLists;
Future getOrders() async {
Map<String, dynamic> body = Map();
hasError = false;
await baseAppClient.post(GET_ANCILLARY_ORDERS,
onSuccess: (dynamic response, int statusCode) {
response['AncillaryOrderList'].forEach((item) {
ancillaryLists.add(AncillaryOrdersListModel.fromJson(item));
});
}, onFailure: (String error, int statusCode) {
hasError = true;
super.error = error;
}, body: body);
}
}

@ -0,0 +1,96 @@
import 'package:diplomaticquarterapp/config/config.dart';
import 'package:diplomaticquarterapp/core/model/er/ErPatientShareModel.dart';
import 'package:diplomaticquarterapp/core/model/er/TriageQuestionsModel.dart';
import 'package:diplomaticquarterapp/core/service/base_service.dart';
class EdOnlineServices extends BaseService {
List<TriageQuestionsModel> triageQuestionsModelList = List();
ErPatientShareModel erPatientShareModel;
Future getQuestions() async {
hasError =false;
triageQuestionsModelList.clear();
Map<String, dynamic> body = Map();
body['ProjectID'] = 15;
await baseAppClient.post(ER_GET_VISUAL_TRIAGE_QUESTIONS,
onSuccess: (dynamic response, int statusCode) {
triageQuestionsModelList.clear();
response['ER_TriageQuestionsList'].forEach((questions) {
triageQuestionsModelList.add(TriageQuestionsModel.fromJson(questions));
});
}, onFailure: (String error, int statusCode) {
hasError = true;
super.error = error;
}, body: body);
}
Future getPatientPaymentInformation({var id}) async {
hasError =false;
await baseAppClient.post(ER_GetPatientPaymentInformationForERClinic,
onSuccess: (dynamic response, int statusCode) {
erPatientShareModel =
ErPatientShareModel.fromJson(response['ER_PatientShare']);
}, onFailure: (String error, int statusCode) {
hasError = true;
super.error = error;
}, body: Map.from({"ProjectID":15,"ClinicID":10}));
}
Future saveQuestionsInformation(
{String notes,
String chiefComplaint,
int projectId,
DateTime selectedTime,
List<TriageQuestionsModel> selectedQuestions}) async {
hasError =false;
Map<String, dynamic> body = Map();
List<Map> checklist = List();
body['ProjectID'] = 15;
body['ProjectId'] = projectId;
int riskScore = 0;
if (user.age > 14) {
selectedQuestions.forEach((element) {
int score = int.parse(element.adultPoints);
riskScore += score;
checklist.add(Map.from({
"IsSelected": 1,
"ParameterCode": element.parameterCode,
"ParameterGroup": element.parameterGroup,
"ParameterType": element.parameterType,
"Score": score
}));
});
} else {
selectedQuestions.forEach((element) {
int score = int.parse(element.pediaPoints);
riskScore += score;
checklist.add(Map.from({
"IsSelected": 1,
"ParameterCode": element.parameterCode,
"ParameterGroup": element.parameterGroup,
"ParameterType": element.parameterType,
"Score": score
}));
});
}
body['ERTriageInformation'] = {
"Notes": notes,
"ChiefComplaint": chiefComplaint,
"PatientId": user.patientID,
"ProjectId": 15,
"RiskScore": riskScore,
"checklist": checklist.map((e) => e).toList()
};
await baseAppClient.post(ER_SAVE_TRIAGE_INFORMATION,
onSuccess: (dynamic response, int statusCode) {},
onFailure: (String error, int statusCode) {
hasError = true;
super.error = error;
}, body: body);
}
}

@ -27,8 +27,8 @@ class PharmacyCategoriseService extends BaseService {
List<PharmacyProduct> get parentProductsList => _parentProductsList; List<PharmacyProduct> get parentProductsList => _parentProductsList;
//service four //service four
List<SubCategoriesModel> _subCategoriseList = List(); List<CategoriseParentModel> _subCategoriseList = List();
List<SubCategoriesModel> get subCategoriseList => _subCategoriseList; List<CategoriseParentModel> get subCategoriseList => _subCategoriseList;
//service five //service five
List<PharmacyProduct> _subProductsList = List(); List<PharmacyProduct> _subProductsList = List();
@ -40,8 +40,8 @@ class PharmacyCategoriseService extends BaseService {
//service 7 //service 7
List<BrandsModel> _brandsList = List(); List<CategoriseParentModel> _brandsList = List();
List<BrandsModel> get brandsList => _brandsList; List<CategoriseParentModel> get brandsList => _brandsList;
// service 8 // service 8
@ -112,14 +112,14 @@ class PharmacyCategoriseService extends BaseService {
); );
} }
Future getBrands() async { Future getBrands({String id}) async {
hasError = false; hasError = false;
_brandsList.clear(); _brandsList.clear();
await baseAppClient.getPharmacy( await baseAppClient.getPharmacy(
GET_BRANDS_LIST, GET_BRANDS_LIST + "$id" + "&fields=id,name,image,namen",
onSuccess: (dynamic response, int statusCode) { onSuccess: (dynamic response, int statusCode) {
response['manufacturer'].forEach((item) { response['manufacturer'].forEach((item) {
_brandsList.add(BrandsModel.fromJson(item)); _brandsList.add(CategoriseParentModel.fromJson(item));
}); });
}, },
onFailure: (String error, int statusCode) { onFailure: (String error, int statusCode) {
@ -178,7 +178,7 @@ class PharmacyCategoriseService extends BaseService {
endPoint, endPoint,
onSuccess: (dynamic response, int statusCode) { onSuccess: (dynamic response, int statusCode) {
response['categories'].forEach((item) { response['categories'].forEach((item) {
_subCategoriseList.add(SubCategoriesModel.fromJson(item)); _subCategoriseList.add(CategoriseParentModel.fromJson(item));
}); });
}, },
onFailure: (String error, int statusCode) { onFailure: (String error, int statusCode) {
@ -291,4 +291,29 @@ class PharmacyCategoriseService extends BaseService {
throw error; throw error;
} }
} }
Future getFilteredProducts(
{String categoryId, String brandId, String min, String max}) async {
hasError = false;
String endPoint;
_parentProductsList.clear();
endPoint = FILTERED_PRODUCTS +
"$categoryId" +
"&manufacturerids=$brandId" +
"&price_min=$min" +
"&price_max=$max&page=1&limit=50";
await baseAppClient.getPharmacy(
endPoint,
onSuccess: (dynamic response, int statusCode) {
response['products'].forEach((item) {
_parentProductsList.add(PharmacyProduct.fromJson(item));
});
},
onFailure: (String error, int statusCode) {
hasError = true;
super.error = error;
},
);
}
} }

@ -0,0 +1,22 @@
import 'package:diplomaticquarterapp/core/service/ancillary_orders_service.dart';
import 'base_view_model.dart';
import '../../locator.dart';
import 'package:diplomaticquarterapp/core/enum/viewstate.dart';
class AnciallryOrdersViewModel extends BaseViewModel {
bool hasError = false;
AncillaryOrdersService _ancillaryService = locator<AncillaryOrdersService>();
Future getOrders() async {
hasError = false;
setState(ViewState.Busy);
await _ancillaryService.getOrders();
if (_ancillaryService.hasError) {
error = _ancillaryService.error;
setState(ViewState.ErrorLocal);
} else
setState(ViewState.Idle);
}
}

@ -0,0 +1,76 @@
import 'package:diplomaticquarterapp/core/enum/viewstate.dart';
import 'package:diplomaticquarterapp/core/model/er/ErPatientShareModel.dart';
import 'package:diplomaticquarterapp/core/model/er/TriageQuestionsModel.dart';
import 'package:diplomaticquarterapp/core/model/hospitals/hospitals_model.dart';
import 'package:diplomaticquarterapp/core/service/er/EdOnlineServices.dart';
import 'package:diplomaticquarterapp/core/service/hospital_service.dart';
import 'package:diplomaticquarterapp/core/viewModels/base_view_model.dart';
import '../../../locator.dart';
class EdOnlineViewModel extends BaseViewModel {
HospitalService _hospitalService = locator<HospitalService>();
EdOnlineServices _edOnlineServices = locator<EdOnlineServices>();
List<HospitalsModel> get hospitals => _hospitalService.hospitals;
List<TriageQuestionsModel> get triageQuestionsModelList =>
_edOnlineServices.triageQuestionsModelList;
ErPatientShareModel get erPatientShareModel => _edOnlineServices.erPatientShareModel;
Future getHospitals() async {
if(_hospitalService.hospitals.isEmpty){
setState(ViewState.Busy);
await _hospitalService.getHospitals();
if (_hospitalService.hasError) {
error = _hospitalService.error;
setState(ViewState.Error);
} else
setState(ViewState.Idle);
}
}
Future getQuestions() async {
if(_edOnlineServices.triageQuestionsModelList.isEmpty){
setState(ViewState.Busy);
await _edOnlineServices.getQuestions();
if (_edOnlineServices.hasError) {
error = _edOnlineServices.error;
setState(ViewState.Error);
} else
setState(ViewState.Idle);
}
}
Future getPatientPaymentInformation({var id}) async {
setState(ViewState.Busy);
await _edOnlineServices.getPatientPaymentInformation();
if (_edOnlineServices.hasError) {
error = _edOnlineServices.error;
setState(ViewState.Error);
} else
setState(ViewState.Idle);
}
Future saveQuestionsInformation(
{String notes,
String chiefComplaint,
int projectId,
DateTime selectedTime,
List<TriageQuestionsModel> selectedQuestions}) async {
setState(ViewState.BusyLocal);
await _edOnlineServices.saveQuestionsInformation(
notes: notes,
projectId: projectId,
chiefComplaint: chiefComplaint,
selectedTime: selectedTime,
selectedQuestions: selectedQuestions);
if (_edOnlineServices.hasError) {
error = _edOnlineServices.error;
setState(ViewState.ErrorLocal);
} else
setState(ViewState.Idle);
}
}

@ -29,7 +29,7 @@ class PharmacyCategoriseViewModel extends BaseViewModel {
List<PharmacyProduct> get parentProducts => List<PharmacyProduct> get parentProducts =>
_pharmacyCategoriseService.parentProductsList; _pharmacyCategoriseService.parentProductsList;
List<SubCategoriesModel> get subCategorise => List<CategoriseParentModel> get subCategorise =>
_pharmacyCategoriseService.subCategoriseList; _pharmacyCategoriseService.subCategoriseList;
List<PharmacyProduct> get subProducts => List<PharmacyProduct> get subProducts =>
@ -37,7 +37,8 @@ class PharmacyCategoriseViewModel extends BaseViewModel {
List<PharmacyProduct> get finalProducts => List<PharmacyProduct> get finalProducts =>
_pharmacyCategoriseService.finalProducts; _pharmacyCategoriseService.finalProducts;
List<BrandsModel> get brandsList => _pharmacyCategoriseService.brandsList; List<CategoriseParentModel> get brandsList =>
_pharmacyCategoriseService.brandsList;
List<PharmacyProduct> get searchList => _pharmacyCategoriseService.searchList; List<PharmacyProduct> get searchList => _pharmacyCategoriseService.searchList;
@ -55,11 +56,11 @@ class PharmacyCategoriseViewModel extends BaseViewModel {
setState(ViewState.Idle); setState(ViewState.Idle);
} }
Future getBrands() async { Future getBrands({String id}) async {
hasError = false; hasError = false;
// _insuranceCardService.clearInsuranceCard(); // _insuranceCardService.clearInsuranceCard();
setState(ViewState.Busy); setState(ViewState.Busy);
await _pharmacyCategoriseService.getBrands(); await _pharmacyCategoriseService.getBrands(id: id);
if (_pharmacyCategoriseService.hasError) { if (_pharmacyCategoriseService.hasError) {
error = _pharmacyCategoriseService.error; error = _pharmacyCategoriseService.error;
setState(ViewState.ErrorLocal); setState(ViewState.ErrorLocal);
@ -105,7 +106,7 @@ class PharmacyCategoriseViewModel extends BaseViewModel {
setState(ViewState.ErrorLocal); setState(ViewState.ErrorLocal);
} else } else
await getParentProducts(i: i); await getParentProducts(i: i);
await getBrands(); await getBrands(id: i);
} }
Future getParentProducts({String i}) async { Future getParentProducts({String i}) async {
@ -156,6 +157,20 @@ class PharmacyCategoriseViewModel extends BaseViewModel {
setState(ViewState.Idle); setState(ViewState.Idle);
} }
Future getFilteredProducts(
{String categoryId, String brandId, String min, String max}) async {
hasError = false;
// _insuranceCardService.clearInsuranceCard();
setState(ViewState.Busy);
await _pharmacyCategoriseService.getFilteredProducts(
categoryId: categoryId, brandId: brandId, max: max, min: min);
if (_pharmacyCategoriseService.hasError) {
error = _pharmacyCategoriseService.error;
setState(ViewState.ErrorLocal);
} else
setState(ViewState.Idle);
}
Future getManufacturerProducts(String id) async { Future getManufacturerProducts(String id) async {
setState(ViewState.Busy); setState(ViewState.Busy);
await _pharmacyCategoriseService.getManufacturerProducts(id); await _pharmacyCategoriseService.getManufacturerProducts(id);

@ -38,6 +38,7 @@ import 'core/service/childvaccines/vaccination_table_service.dart';
import 'core/service/contactus/finadus_service.dart'; import 'core/service/contactus/finadus_service.dart';
import 'core/service/contactus/livechat_service.dart'; import 'core/service/contactus/livechat_service.dart';
import 'core/service/dashboard_service.dart'; import 'core/service/dashboard_service.dart';
import 'core/service/er/EdOnlineServices.dart';
import 'core/service/er/am_service.dart'; import 'core/service/er/am_service.dart';
import 'core/service/er/er_service.dart'; import 'core/service/er/er_service.dart';
import 'core/service/feedback/feedback_service.dart'; import 'core/service/feedback/feedback_service.dart';
@ -75,6 +76,7 @@ import 'core/service/parmacyModule/parmacy_module_service.dart';
import 'core/service/offers_service.dart'; import 'core/service/offers_service.dart';
import 'core/service/pharmacy_categorise_service.dart'; import 'core/service/pharmacy_categorise_service.dart';
import 'core/viewModels/AlHabibMedicalService/health-calculator/Bariatrics-viewmodel.dart'; import 'core/viewModels/AlHabibMedicalService/health-calculator/Bariatrics-viewmodel.dart';
import 'core/viewModels/er/EdOnlineViewModel.dart';
import 'core/viewModels/medical/PrescriptionDeliveryViewModel.dart'; import 'core/viewModels/medical/PrescriptionDeliveryViewModel.dart';
import 'core/viewModels/TermsConditionsViewModel.dart'; import 'core/viewModels/TermsConditionsViewModel.dart';
import 'core/viewModels/all_habib_medical_services/e_referral_view_model.dart'; import 'core/viewModels/all_habib_medical_services/e_referral_view_model.dart';
@ -192,6 +194,7 @@ void setupLocator() {
locator.registerLazySingleton(() => DeleteBabyService()); locator.registerLazySingleton(() => DeleteBabyService());
locator.registerLazySingleton(() => VaccinationTableService()); locator.registerLazySingleton(() => VaccinationTableService());
locator.registerLazySingleton(() => EdOnlineServices());
//pharmacy //pharmacy
// locator.registerLazySingleton(() => PharmacyCategoriseService()); // locator.registerLazySingleton(() => PharmacyCategoriseService());
@ -286,6 +289,7 @@ void setupLocator() {
locator.registerFactory(() => LacumViewModel()); locator.registerFactory(() => LacumViewModel());
locator.registerFactory(() => LacumTranferViewModel()); locator.registerFactory(() => LacumTranferViewModel());
locator.registerFactory(() => LacumRegistrationViewModel()); locator.registerFactory(() => LacumRegistrationViewModel());
locator.registerFactory(() => EdOnlineViewModel());
//pharmacy //pharmacy
locator.registerFactory(() => PharmacyCategoriseViewModel()); locator.registerFactory(() => PharmacyCategoriseViewModel());

@ -0,0 +1,105 @@
class AncillaryOrdersListModel {
List<AncillaryOrderList> ancillaryOrderList;
Null errCode;
String message;
int patientID;
String patientName;
int patientType;
int projectID;
String projectName;
String setupID;
int statusCode;
AncillaryOrdersListModel(
{this.ancillaryOrderList,
this.errCode,
this.message,
this.patientID,
this.patientName,
this.patientType,
this.projectID,
this.projectName,
this.setupID,
this.statusCode});
AncillaryOrdersListModel.fromJson(Map<String, dynamic> json) {
if (json['AncillaryOrderList'] != null) {
ancillaryOrderList = new List<AncillaryOrderList>();
json['AncillaryOrderList'].forEach((v) {
ancillaryOrderList.add(new AncillaryOrderList.fromJson(v));
});
}
errCode = json['ErrCode'];
message = json['Message'];
patientID = json['PatientID'];
patientName = json['PatientName'];
patientType = json['PatientType'];
projectID = json['ProjectID'];
projectName = json['ProjectName'];
setupID = json['SetupID'];
statusCode = json['StatusCode'];
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
if (this.ancillaryOrderList != null) {
data['AncillaryOrderList'] =
this.ancillaryOrderList.map((v) => v.toJson()).toList();
}
data['ErrCode'] = this.errCode;
data['Message'] = this.message;
data['PatientID'] = this.patientID;
data['PatientName'] = this.patientName;
data['PatientType'] = this.patientType;
data['ProjectID'] = this.projectID;
data['ProjectName'] = this.projectName;
data['SetupID'] = this.setupID;
data['StatusCode'] = this.statusCode;
return data;
}
}
class AncillaryOrderList {
String appointmentDate;
int appointmentNo;
int clinicID;
String clinicName;
int doctorID;
String doctorName;
String orderDate;
int orderNo;
AncillaryOrderList(
{this.appointmentDate,
this.appointmentNo,
this.clinicID,
this.clinicName,
this.doctorID,
this.doctorName,
this.orderDate,
this.orderNo});
AncillaryOrderList.fromJson(Map<String, dynamic> json) {
appointmentDate = json['AppointmentDate'];
appointmentNo = json['AppointmentNo'];
clinicID = json['ClinicID'];
clinicName = json['ClinicName'];
doctorID = json['DoctorID'];
doctorName = json['DoctorName'];
orderDate = json['OrderDate'];
orderNo = json['OrderNo'];
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['AppointmentDate'] = this.appointmentDate;
data['AppointmentNo'] = this.appointmentNo;
data['ClinicID'] = this.clinicID;
data['ClinicName'] = this.clinicName;
data['DoctorID'] = this.doctorID;
data['DoctorName'] = this.doctorName;
data['OrderDate'] = this.orderDate;
data['OrderNo'] = this.orderNo;
return data;
}
}

@ -22,28 +22,25 @@ class CMCLocationPage extends StatefulWidget {
final double longitude; final double longitude;
final dynamic model; final dynamic model;
const CMCLocationPage({Key key, this.onPick, this.latitude, this.longitude, this.model}) const CMCLocationPage(
{Key key, this.onPick, this.latitude, this.longitude, this.model})
: super(key: key); : super(key: key);
@override @override
_CMCLocationPageState createState() => _CMCLocationPageState createState() => _CMCLocationPageState();
_CMCLocationPageState();
} }
class _CMCLocationPageState class _CMCLocationPageState extends State<CMCLocationPage> {
extends State<CMCLocationPage> {
double latitude = 0; double latitude = 0;
double longitude = 0; double longitude = 0;
@override @override
void initState() { void initState() {
latitude = widget.latitude; latitude = widget.latitude;
longitude = widget.longitude; longitude = widget.longitude;
super.initState(); super.initState();
} }
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
ProjectViewModel projectViewModel = Provider.of(context); ProjectViewModel projectViewModel = Provider.of(context);
@ -64,11 +61,11 @@ class _CMCLocationPageState
searchForInitialValue: false, searchForInitialValue: false,
onPlacePicked: (PickResult result) { onPlacePicked: (PickResult result) {
print(result.adrAddress); print(result.adrAddress);
}, },
selectedPlaceWidgetBuilder: selectedPlaceWidgetBuilder:
(_, selectedPlace, state, isSearchBarFocused) { (_, selectedPlace, state, isSearchBarFocused) {
print("state: $state, isSearchBarFocused: $isSearchBarFocused"); print(
"state: $state, isSearchBarFocused: $isSearchBarFocused");
return isSearchBarFocused return isSearchBarFocused
? Container() ? Container()
: FloatingCard( : FloatingCard(
@ -93,47 +90,58 @@ class _CMCLocationPageState
new AddNewAddressRequestModel( new AddNewAddressRequestModel(
customer: Customer(addresses: [ customer: Customer(addresses: [
Addresses( Addresses(
address1: address1: selectedPlace
selectedPlace.formattedAddress, .formattedAddress,
address2: selectedPlace address2: selectedPlace
.formattedAddress, .formattedAddress,
customerAttributes: "", customerAttributes: "",
city: "", city: "",
createdOnUtc: "", createdOnUtc: "",
id: 0, id: 0,
latLong: "$latitude,$longitude", latLong:
"$latitude,$longitude",
email: "") email: "")
]), ]),
); );
selectedPlace.addressComponents.forEach((e) { selectedPlace.addressComponents
.forEach((e) {
if (e.types.contains("country")) { if (e.types.contains("country")) {
addNewAddressRequestModel.customer addNewAddressRequestModel
.addresses[0].country = e.longName; .customer
.addresses[0]
.country = e.longName;
} }
if (e.types.contains("postal_code")) { if (e.types
addNewAddressRequestModel.customer .contains("postal_code")) {
.addresses[0].zipPostalCode = addNewAddressRequestModel
e.longName; .customer
.addresses[0]
.zipPostalCode = e.longName;
} }
if (e.types.contains("locality")) { if (e.types.contains("locality")) {
addNewAddressRequestModel.customer addNewAddressRequestModel
.addresses[0].city = .customer
e.longName; .addresses[0]
.city = e.longName;
} }
}); });
await model.addAddressInfo( await model.addAddressInfo(
addNewAddressRequestModel: addNewAddressRequestModel); addNewAddressRequestModel:
if (model.state == ViewState.ErrorLocal) { addNewAddressRequestModel);
if (model.state ==
ViewState.ErrorLocal) {
Utils.showErrorToast(model.error); Utils.showErrorToast(model.error);
} else { } else {
AppToast.showSuccessToast( AppToast.showSuccessToast(
message: "Address Added Successfully"); message:
"Address Added Successfully");
} }
Navigator.of(context).pop(); Navigator.of(context).pop();
}, },
label: TranslationBase.of(context).addNewAddress, label: TranslationBase.of(context)
.addNewAddress,
), ),
], ],
), ),

@ -26,12 +26,10 @@ class NewCMCPage extends StatefulWidget {
final CMCViewModel model; final CMCViewModel model;
@override @override
_NewCMCPageState createState() => _NewCMCPageState createState() => _NewCMCPageState();
_NewCMCPageState();
} }
class _NewCMCPageState extends State<NewCMCPage> class _NewCMCPageState extends State<NewCMCPage> with TickerProviderStateMixin {
with TickerProviderStateMixin {
PageController _controller; PageController _controller;
int _currentIndex = 1; int _currentIndex = 1;
@ -49,7 +47,8 @@ class _NewCMCPageState extends State<NewCMCPage>
price: widget.model.cmcAllServicesList[0].price, price: widget.model.cmcAllServicesList[0].price,
serviceID: widget.model.cmcAllServicesList[0].serviceID.toString(), serviceID: widget.model.cmcAllServicesList[0].serviceID.toString(),
selectedServiceName: widget.model.cmcAllServicesList[0].description, selectedServiceName: widget.model.cmcAllServicesList[0].description,
selectedServiceNameAR: widget.model.cmcAllServicesList[0].descriptionN, selectedServiceNameAR:
widget.model.cmcAllServicesList[0].descriptionN,
recordID: 1, recordID: 1,
totalPrice: widget.model.cmcAllServicesList[0].totalPrice, totalPrice: widget.model.cmcAllServicesList[0].totalPrice,
vAT: widget.model.cmcAllServicesList[0].vAT); vAT: widget.model.cmcAllServicesList[0].vAT);
@ -101,17 +100,21 @@ class _NewCMCPageState extends State<NewCMCPage>
UpdatePresOrderRequestModel( UpdatePresOrderRequestModel(
presOrderID: order.presOrderID, presOrderID: order.presOrderID,
rejectionReason: "", rejectionReason: "",
presOrderStatus: 4, editedBy: 3); presOrderStatus: 4,
editedBy: 3);
await model.updateCmcPresOrder(updatePresOrderRequestModel); await model.updateCmcPresOrder(updatePresOrderRequestModel);
if (model.state == ViewState.ErrorLocal) { if (model.state == ViewState.ErrorLocal) {
Utils.showErrorToast(model.error); Utils.showErrorToast(model.error);
} else { } else {
AppToast.showSuccessToast(message:TranslationBase.of(context).processDoneSuccessfully ); AppToast.showSuccessToast(
message:
TranslationBase.of(context).processDoneSuccessfully);
await model.getCmcAllPresOrders(); await model.getCmcAllPresOrders();
} }
}, },
)); ));
} }
return Scaffold( return Scaffold(
body: SafeArea( body: SafeArea(
child: SingleChildScrollView( child: SingleChildScrollView(
@ -150,12 +153,15 @@ class _NewCMCPageState extends State<NewCMCPage>
width: double.infinity, width: double.infinity,
margin: EdgeInsets.only(top: 15), margin: EdgeInsets.only(top: 15),
decoration: BoxDecoration( decoration: BoxDecoration(
border: border: Border.all(
Border.all(color: Colors.grey, width: 1), color: Colors.grey, width: 1),
borderRadius: BorderRadius.circular(12), borderRadius:
color: Colors.white), BorderRadius.circular(12),
color:
Theme.of(context).primaryColor),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment:
CrossAxisAlignment.start,
children: [ children: [
SizedBox( SizedBox(
height: 12, height: 12,
@ -163,7 +169,10 @@ class _NewCMCPageState extends State<NewCMCPage>
Container( Container(
width: double.infinity, width: double.infinity,
padding: EdgeInsets.only( padding: EdgeInsets.only(
left: 15, bottom: 15, top: 15,right: 15), left: 15,
bottom: 15,
top: 15,
right: 15),
decoration: BoxDecoration( decoration: BoxDecoration(
border: Border( border: Border(
bottom: BorderSide( bottom: BorderSide(
@ -172,13 +181,14 @@ class _NewCMCPageState extends State<NewCMCPage>
), ),
), ),
// borderRadius: BorderRadius.circular(12), // borderRadius: BorderRadius.circular(12),
color: Colors.white), color: Theme.of(context)
.primaryColor),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment:
CrossAxisAlignment.start,
children: [ children: [
Texts( Texts(
TranslationBase TranslationBase.of(context)
.of(context)
.requestID, .requestID,
bold: false, bold: false,
fontSize: 13, fontSize: 13,
@ -187,7 +197,9 @@ class _NewCMCPageState extends State<NewCMCPage>
height: 4, height: 4,
), ),
Texts( Texts(
widget.model.cmcAllOrderDetail[0].iD.toString(), widget.model
.cmcAllOrderDetail[0].iD
.toString(),
fontSize: 22, fontSize: 22,
), ),
], ],
@ -196,7 +208,10 @@ class _NewCMCPageState extends State<NewCMCPage>
Container( Container(
width: double.infinity, width: double.infinity,
padding: EdgeInsets.only( padding: EdgeInsets.only(
left: 15, bottom: 15, top: 15,right: 15), left: 15,
bottom: 15,
top: 15,
right: 15),
decoration: BoxDecoration( decoration: BoxDecoration(
border: Border( border: Border(
bottom: BorderSide( bottom: BorderSide(
@ -205,13 +220,14 @@ class _NewCMCPageState extends State<NewCMCPage>
), ),
), ),
// borderRadius: BorderRadius.circular(12), // borderRadius: BorderRadius.circular(12),
color: Colors.white), color: Theme.of(context)
.primaryColor),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment:
CrossAxisAlignment.start,
children: [ children: [
Texts( Texts(
TranslationBase TranslationBase.of(context)
.of(context)
.OrderStatus, .OrderStatus,
bold: false, bold: false,
fontSize: 13, fontSize: 13,
@ -220,9 +236,15 @@ class _NewCMCPageState extends State<NewCMCPage>
height: 4, height: 4,
), ),
Texts( Texts(
projectViewModel.isArabic
projectViewModel.isArabic ? widget.model.cmcAllOrderDetail[0] ? widget
.descriptionN : widget.model.cmcAllOrderDetail[0].description, .model
.cmcAllOrderDetail[0]
.descriptionN
: widget
.model
.cmcAllOrderDetail[0]
.description,
fontSize: 22, fontSize: 22,
), ),
], ],
@ -231,7 +253,10 @@ class _NewCMCPageState extends State<NewCMCPage>
Container( Container(
width: double.infinity, width: double.infinity,
padding: EdgeInsets.only( padding: EdgeInsets.only(
left: 15, bottom: 15, top: 15,right: 15), left: 15,
bottom: 15,
top: 15,
right: 15),
decoration: BoxDecoration( decoration: BoxDecoration(
border: Border( border: Border(
bottom: BorderSide( bottom: BorderSide(
@ -240,12 +265,15 @@ class _NewCMCPageState extends State<NewCMCPage>
), ),
), ),
// borderRadius: BorderRadius.circular(12), // borderRadius: BorderRadius.circular(12),
color: Colors.white), color: Theme.of(context)
.primaryColor),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment:
CrossAxisAlignment.start,
children: [ children: [
Texts( Texts(
TranslationBase.of(context).pickupDate, TranslationBase.of(context)
.pickupDate,
bold: false, bold: false,
fontSize: 13, fontSize: 13,
), ),
@ -254,7 +282,12 @@ class _NewCMCPageState extends State<NewCMCPage>
), ),
Texts( Texts(
DateUtil.getDayMonthYearDateFormatted( DateUtil.getDayMonthYearDateFormatted(
DateUtil.convertStringToDate(widget.model.cmcAllOrderDetail[0].createdOn)), DateUtil.convertStringToDate(
widget
.model
.cmcAllOrderDetail[
0]
.createdOn)),
fontSize: 22, fontSize: 22,
), ),
], ],
@ -272,13 +305,15 @@ class _NewCMCPageState extends State<NewCMCPage>
), ),
), ),
// borderRadius: BorderRadius.circular(12), // borderRadius: BorderRadius.circular(12),
color: Colors.white), color: Theme.of(context)
.primaryColor),
child: Column( child: Column(
crossAxisAlignment: crossAxisAlignment:
CrossAxisAlignment.start, CrossAxisAlignment.start,
children: [ children: [
Texts( Texts(
TranslationBase.of(context).serviceName, TranslationBase.of(context)
.serviceName,
bold: false, bold: false,
fontSize: 13, fontSize: 13,
), ),
@ -286,9 +321,15 @@ class _NewCMCPageState extends State<NewCMCPage>
height: 4, height: 4,
), ),
Texts( Texts(
!projectViewModel.isArabic?widget.model.cmcAllOrderDetail[0].description !projectViewModel.isArabic
.toString() : ? widget
widget.model.cmcAllOrderDetail[0] .model
.cmcAllOrderDetail[0]
.description
.toString()
: widget
.model
.cmcAllOrderDetail[0]
.descriptionN .descriptionN
.toString(), .toString(),
fontSize: 22, fontSize: 22,
@ -301,22 +342,24 @@ class _NewCMCPageState extends State<NewCMCPage>
), ),
Center( Center(
child: Container( child: Container(
width: MediaQuery width: MediaQuery.of(context)
.of(context)
.size .size
.width * .width *
0.85, 0.85,
child: SecondaryButton( child: SecondaryButton(
label: TranslationBase.of(context).cancel.toUpperCase(), label: TranslationBase.of(
context)
.cancel
.toUpperCase(),
onTap: () { onTap: () {
showConfirmMessage(widget.model, showConfirmMessage(
widget.model.cmcAllOrderDetail[0]); widget.model,
} widget.model
, .cmcAllOrderDetail[0]);
},
color: Colors.red[800], color: Colors.red[800],
disabled: false, disabled: false,
textColor: Theme textColor: Theme.of(context)
.of(context)
.backgroundColor), .backgroundColor),
), ),
), ),
@ -343,11 +386,14 @@ class _NewCMCPageState extends State<NewCMCPage>
longitude: _longitude, longitude: _longitude,
latitude: _latitude, latitude: _latitude,
changePageViewIndex: changePageViewIndex, changePageViewIndex: changePageViewIndex,
cmcInsertPresOrderRequestModel: cMCInsertPresOrderRequestModel, cmcInsertPresOrderRequestModel:
cMCInsertPresOrderRequestModel,
model: widget.model, model: widget.model,
), NewCMCStepThreePage( ),
NewCMCStepThreePage(
changePageViewIndex: changePageViewIndex, changePageViewIndex: changePageViewIndex,
cmcInsertPresOrderRequestModel: cMCInsertPresOrderRequestModel, cmcInsertPresOrderRequestModel:
cMCInsertPresOrderRequestModel,
model: widget.model, model: widget.model,
), ),
], ],

@ -69,7 +69,7 @@ class _NewCMCStepOnePageState extends State<NewCMCStepOnePage> {
border: border:
Border.all(color: Colors.grey, width: 1), Border.all(color: Colors.grey, width: 1),
borderRadius: BorderRadius.circular(12), borderRadius: BorderRadius.circular(12),
color: Colors.white), color: Theme.of(context).primaryColor),
child: Column( child: Column(
children: [ children: [
Row( Row(
@ -95,8 +95,7 @@ class _NewCMCStepOnePageState extends State<NewCMCStepOnePage> {
setState(() { setState(() {
widget widget
.cMCInsertPresOrderRequestModel .cMCInsertPresOrderRequestModel
.patientERCMCInsertServicesList = .patientERCMCInsertServicesList = [
[
patientERCMCInsertServicesList patientERCMCInsertServicesList
]; ];
}); });
@ -123,9 +122,9 @@ class _NewCMCStepOnePageState extends State<NewCMCStepOnePage> {
child: Padding( child: Padding(
padding: const EdgeInsets.all(20.0), padding: const EdgeInsets.all(20.0),
child: Texts( child: Texts(
projectViewModel.isArabic ? service projectViewModel.isArabic
.descriptionN : service ? service.descriptionN
.description, : service.description,
fontSize: 15, fontSize: 15,
), ),
), ),
@ -144,14 +143,18 @@ class _NewCMCStepOnePageState extends State<NewCMCStepOnePage> {
height: 30, height: 30,
), ),
Container( Container(
color: Colors.white, color: Theme.of(context).primaryColor,
width: double.infinity, width: double.infinity,
child: Column( child: Column(
children: [ children: [
Row( Row(
children: [ children: [
Container(margin: EdgeInsets.only( Container(
right: 10, left: 10), child: Texts(TranslationBase.of(context).coveredService, fontWeight: FontWeight.bold,)) margin: EdgeInsets.only(right: 10, left: 10),
child: Texts(
TranslationBase.of(context).coveredService,
fontWeight: FontWeight.bold,
))
], ],
), ),
Column( Column(
@ -163,10 +166,10 @@ class _NewCMCStepOnePageState extends State<NewCMCStepOnePage> {
child: Container( child: Container(
margin: EdgeInsets.only(top: 15), margin: EdgeInsets.only(top: 15),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.white), color: Theme.of(context).primaryColor),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment crossAxisAlignment:
.start, CrossAxisAlignment.start,
children: [ children: [
SizedBox( SizedBox(
height: 12, height: 12,
@ -182,17 +185,18 @@ class _NewCMCStepOnePageState extends State<NewCMCStepOnePage> {
width: 0.5, width: 0.5,
color: Colors.grey)), color: Colors.grey)),
//borderRadius: , //borderRadius: ,
color: Colors.white), color:
Theme.of(context).primaryColor),
child: Column( child: Column(
crossAxisAlignment: crossAxisAlignment:
CrossAxisAlignment.start, CrossAxisAlignment.start,
children: [ children: [
Container(margin: EdgeInsets.only( Container(
margin: EdgeInsets.only(
right: 10, left: 10), right: 10, left: 10),
child: Texts( child: Texts(item.itemName,
item.itemName, fontSize: 15,
fontSize: 15, fontWeight: FontWeight.bold fontWeight: FontWeight.bold),
),
), ),
], ],
), ),
@ -222,12 +226,8 @@ class _NewCMCStepOnePageState extends State<NewCMCStepOnePage> {
Container( Container(
width: MediaQuery.of(context).size.width * 0.9, width: MediaQuery.of(context).size.width * 0.9,
child: SecondaryButton( child: SecondaryButton(
label: TranslationBase label: TranslationBase.of(context).next,
.of(context) textColor: Theme.of(context).backgroundColor,
.next,
textColor: Theme
.of(context)
.backgroundColor,
color: Colors.grey[800], color: Colors.grey[800],
onTap: () async { onTap: () async {
if (widget.cMCInsertPresOrderRequestModel if (widget.cMCInsertPresOrderRequestModel
@ -252,7 +252,8 @@ class _NewCMCStepOnePageState extends State<NewCMCStepOnePage> {
recordID: 1, recordID: 1,
totalPrice: widget totalPrice: widget
.model.cmcAllServicesList[index - 1].totalPrice, .model.cmcAllServicesList[index - 1].totalPrice,
vAT: widget.model.cmcAllServicesList[index - 1].vAT); vAT:
widget.model.cmcAllServicesList[index - 1].vAT);
widget.cMCInsertPresOrderRequestModel widget.cMCInsertPresOrderRequestModel
.patientERCMCInsertServicesList = [ .patientERCMCInsertServicesList = [

@ -25,12 +25,10 @@ class NewCMCStepThreePage extends StatefulWidget {
this.cmcInsertPresOrderRequestModel}); this.cmcInsertPresOrderRequestModel});
@override @override
_NewCMCStepThreePageState createState() => _NewCMCStepThreePageState createState() => _NewCMCStepThreePageState();
_NewCMCStepThreePageState();
} }
class _NewCMCStepThreePageState class _NewCMCStepThreePageState extends State<NewCMCStepThreePage> {
extends State<NewCMCStepThreePage> {
Completer<GoogleMapController> _controller = Completer(); Completer<GoogleMapController> _controller = Completer();
static CameraPosition _kGooglePlex = CameraPosition( static CameraPosition _kGooglePlex = CameraPosition(
@ -49,8 +47,7 @@ class _NewCMCStepThreePageState
widget.cmcInsertPresOrderRequestModel.latitude.hashCode widget.cmcInsertPresOrderRequestModel.latitude.hashCode
.toString(), .toString(),
), ),
position: LatLng( position: LatLng(widget.cmcInsertPresOrderRequestModel.latitude,
widget.cmcInsertPresOrderRequestModel.latitude,
widget.cmcInsertPresOrderRequestModel.longitude)), widget.cmcInsertPresOrderRequestModel.longitude)),
); );
_kGooglePlex = CameraPosition( _kGooglePlex = CameraPosition(
@ -86,15 +83,16 @@ class _NewCMCStepThreePageState
), ),
Container( Container(
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.white, color: Theme.of(context).primaryColor,
borderRadius: BorderRadius.circular(12)), borderRadius: BorderRadius.circular(12)),
padding: EdgeInsets.all(8), padding: EdgeInsets.all(8),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Texts(TranslationBase Texts(
.of(context) TranslationBase.of(context).orderLocation + " : ",
.orderLocation + " : ", fontWeight: FontWeight.bold,), fontWeight: FontWeight.bold,
),
SizedBox( SizedBox(
height: 12, height: 12,
), ),
@ -115,31 +113,29 @@ class _NewCMCStepThreePageState
SizedBox( SizedBox(
height: 12, height: 12,
), ),
Texts(TranslationBase Texts(TranslationBase.of(context).selectedService),
.of(context)
.selectedService),
...List.generate( ...List.generate(
widget.cmcInsertPresOrderRequestModel widget.cmcInsertPresOrderRequestModel
.patientERCMCInsertServicesList.length, .patientERCMCInsertServicesList.length,
(index) => (index) => Container(
Container(
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Texts( Texts(
TranslationBase TranslationBase.of(context).serviceName,
.of(context) fontSize: 12,
.serviceName, fontWeight: FontWeight.bold,
fontSize: 12, fontWeight: FontWeight.bold,
), ),
SizedBox( SizedBox(
height: 5, height: 5,
), ),
Texts( Texts(
projectViewModel.isArabic ? widget projectViewModel.isArabic
? widget
.cmcInsertPresOrderRequestModel .cmcInsertPresOrderRequestModel
.patientERCMCInsertServicesList[index] .patientERCMCInsertServicesList[index]
.selectedServiceNameAR : widget .selectedServiceNameAR
: widget
.cmcInsertPresOrderRequestModel .cmcInsertPresOrderRequestModel
.patientERCMCInsertServicesList[index] .patientERCMCInsertServicesList[index]
.selectedServiceName, .selectedServiceName,
@ -165,9 +161,7 @@ class _NewCMCStepThreePageState
Container( Container(
width: MediaQuery.of(context).size.width * 0.9, width: MediaQuery.of(context).size.width * 0.9,
child: SecondaryButton( child: SecondaryButton(
label: TranslationBase label: TranslationBase.of(context).confirm,
.of(context)
.confirm,
color: Colors.grey[800], color: Colors.grey[800],
onTap: () async { onTap: () async {
await widget.model.insertPresPresOrder( await widget.model.insertPresPresOrder(
@ -176,9 +170,7 @@ class _NewCMCStepThreePageState
widget.changePageViewIndex(0); widget.changePageViewIndex(0);
} }
}, },
textColor: Theme textColor: Theme.of(context).backgroundColor),
.of(context)
.backgroundColor),
), ),
], ],
), ),

@ -37,17 +37,14 @@ class NewCMCStepTowPage extends StatefulWidget {
: super(key: key); : super(key: key);
@override @override
_NewCMCStepTowPageState createState() => _NewCMCStepTowPageState createState() => _NewCMCStepTowPageState();
_NewCMCStepTowPageState();
} }
class _NewCMCStepTowPageState class _NewCMCStepTowPageState extends State<NewCMCStepTowPage> {
extends State<NewCMCStepTowPage> {
double latitude = 0; double latitude = 0;
double longitude = 0; double longitude = 0;
AddressInfo _selectedAddress; AddressInfo _selectedAddress;
@override @override
void initState() { void initState() {
if (widget.cmcInsertPresOrderRequestModel.latitude == null) { if (widget.cmcInsertPresOrderRequestModel.latitude == null) {
@ -61,13 +58,14 @@ class _NewCMCStepTowPageState
setLatitudeAndLongitude({bool isSetState = false, String latLong}) { setLatitudeAndLongitude({bool isSetState = false, String latLong}) {
if (latLong == null) if (latLong == null)
latLong = widget.model.addressesList[widget.model.addressesList latLong = widget
.length - 1].latLong; .model.addressesList[widget.model.addressesList.length - 1].latLong;
List latLongArr = latLong.split(','); List latLongArr = latLong.split(',');
latitude = double.parse(latLongArr[0]); latitude = double.parse(latLongArr[0]);
longitude = double.parse(latLongArr[1]); longitude = double.parse(latLongArr[1]);
} }
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
ProjectViewModel projectViewModel = Provider.of(context); ProjectViewModel projectViewModel = Provider.of(context);
@ -84,7 +82,6 @@ class _NewCMCStepTowPageState
autocompleteLanguage: projectViewModel.currentLanguage, autocompleteLanguage: projectViewModel.currentLanguage,
enableMapTypeButton: true, enableMapTypeButton: true,
searchForInitialValue: false, searchForInitialValue: false,
onPlacePicked: (PickResult result) { onPlacePicked: (PickResult result) {
print(result.adrAddress); print(result.adrAddress);
widget.changePageViewIndex(3); widget.changePageViewIndex(3);
@ -113,21 +110,21 @@ class _NewCMCStepTowPageState
Navigator.push( Navigator.push(
context, context,
FadePage( FadePage(
page: page: CMCLocationPage(
CMCLocationPage(
latitude: latitude, latitude: latitude,
longitude: longitude, longitude: longitude,
), ),
), ),
); );
}, },
label: TranslationBase.of(context).addNewAddress, label: TranslationBase.of(context)
.addNewAddress,
),
SizedBox(
height: 10,
), ),
SizedBox(height: 10,),
SecondaryButton( SecondaryButton(
color: Colors.red color: Colors.red[800],
[800],
textColor: Colors.white, textColor: Colors.white,
onTap: () { onTap: () {
setState(() { setState(() {
@ -143,8 +140,7 @@ class _NewCMCStepTowPageState
label: TranslationBase.of(context).confirm, label: TranslationBase.of(context).confirm,
), ),
], ],
) )),
),
); );
}, },
initialPosition: LatLng(latitude, longitude), initialPosition: LatLng(latitude, longitude),
@ -160,37 +156,36 @@ class _NewCMCStepTowPageState
// height: 65, // height: 65,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(10), borderRadius: BorderRadius.circular(10),
color: Colors.white), color: Theme.of(context).primaryColor),
child: Row( child: Row(
mainAxisAlignment: mainAxisAlignment: MainAxisAlignment.spaceBetween,
MainAxisAlignment.spaceBetween,
children: [ children: [
Expanded(child: Texts(getAddressName(), fontSize: 14,),), Expanded(
child: Texts(
getAddressName(),
fontSize: 14,
),
),
Icon(Icons.arrow_drop_down) Icon(Icons.arrow_drop_down)
], ],
), ),
), ),
), ),
height: 56, width: double.infinity, color: Theme height: 56,
.of(context) width: double.infinity,
.scaffoldBackgroundColor, color: Theme.of(context).scaffoldBackgroundColor,
) )
], ],
), ),
); );
} }
void confirmSelectLocationDialog(List<AddressInfo> addresses) { void confirmSelectLocationDialog(List<AddressInfo> addresses) {
showDialog( showDialog(
context: context, context: context,
child: SelectLocationDialog( child: SelectLocationDialog(
addresses: addresses, addresses: addresses,
selectedAddress: _selectedAddress selectedAddress: _selectedAddress,
,
onValueSelected: (value) { onValueSelected: (value) {
setLatitudeAndLongitude(latLong: value.latLong); setLatitudeAndLongitude(latLong: value.latLong);
setState(() { setState(() {

@ -17,8 +17,7 @@ class CMCPage extends StatefulWidget {
_CMCPageState createState() => _CMCPageState(); _CMCPageState createState() => _CMCPageState();
} }
class _CMCPageState extends State<CMCPage> class _CMCPageState extends State<CMCPage> with SingleTickerProviderStateMixin {
with SingleTickerProviderStateMixin {
TabController _tabController; TabController _tabController;
@override @override
@ -36,14 +35,18 @@ class _CMCPageState extends State<CMCPage>
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return BaseView<CMCViewModel>( return BaseView<CMCViewModel>(
onModelReady: (model) async{ onModelReady: (model) async {
await model.getCmcAllPresOrders(); await model.getCmcAllPresOrders();
}, },
builder: (_, model, widget) => AppScaffold( builder: (_, model, widget) => AppScaffold(
isShowAppBar: true, isShowAppBar: true,
description:TranslationBase.of(context).infoCMC, description: TranslationBase.of(context).infoCMC,
imagesInfo: [ImagesInfo(imageAr: 'assets/images/Wifi-AR.png',imageEn: 'assets/images/wifi-EN.png', isAsset: true)], imagesInfo: [
ImagesInfo(
imageAr: 'assets/images/Wifi-AR.png',
imageEn: 'assets/images/wifi-EN.png',
isAsset: true)
],
appBarTitle: TranslationBase.of(context).comprehensiveMedicalCheckup, appBarTitle: TranslationBase.of(context).comprehensiveMedicalCheckup,
body: Scaffold( body: Scaffold(
extendBodyBehindAppBar: true, extendBodyBehindAppBar: true,
@ -58,9 +61,7 @@ class _CMCPageState extends State<CMCPage>
child: BackdropFilter( child: BackdropFilter(
filter: ImageFilter.blur(sigmaX: 10, sigmaY: 10), filter: ImageFilter.blur(sigmaX: 10, sigmaY: 10),
child: Container( child: Container(
color: Theme.of(context) color: Theme.of(context).primaryColor.withOpacity(0.8),
.scaffoldBackgroundColor
.withOpacity(0.8),
height: 70.0, height: 70.0,
), ),
), ),
@ -76,7 +77,7 @@ class _CMCPageState extends State<CMCPage>
color: Theme.of(context).dividerColor, color: Theme.of(context).dividerColor,
width: 0.7), width: 0.7),
), ),
color: Colors.white), color: Theme.of(context).primaryColor),
child: Center( child: Center(
child: TabBar( child: TabBar(
isScrollable: true, isScrollable: true,
@ -99,7 +100,8 @@ class _CMCPageState extends State<CMCPage>
Container( Container(
width: MediaQuery.of(context).size.width * 0.37, width: MediaQuery.of(context).size.width * 0.37,
child: Center( child: Center(
child: Texts(TranslationBase.of(context).orderLog), child:
Texts(TranslationBase.of(context).orderLog),
), ),
), ),
], ],

@ -31,19 +31,20 @@ class NewHomeHealthCareStepOnePage extends StatefulWidget {
_NewHomeHealthCareStepOnePageState(); _NewHomeHealthCareStepOnePageState();
} }
class _NewHomeHealthCareStepOnePageState extends State<NewHomeHealthCareStepOnePage> { class _NewHomeHealthCareStepOnePageState
extends State<NewHomeHealthCareStepOnePage> {
PickResult _result; PickResult _result;
@override @override
void initState() { void initState() {
if (widget.patientERInsertPresOrderRequestModel.patientERHHCInsertServicesList == null) if (widget.patientERInsertPresOrderRequestModel
widget.patientERInsertPresOrderRequestModel.patientERHHCInsertServicesList = []; .patientERHHCInsertServicesList ==
null)
widget.patientERInsertPresOrderRequestModel
.patientERHHCInsertServicesList = [];
super.initState(); super.initState();
} }
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
ProjectViewModel projectViewModel = Provider.of(context); ProjectViewModel projectViewModel = Provider.of(context);
@ -67,9 +68,7 @@ class _NewHomeHealthCareStepOnePageState extends State<NewHomeHealthCareStepOneP
height: 12, height: 12,
), ),
Texts( Texts(
TranslationBase TranslationBase.of(context).selectHomeHealthCareServices,
.of(context)
.selectHomeHealthCareServices,
textAlign: TextAlign.center, textAlign: TextAlign.center,
), ),
Column( Column(
@ -79,7 +78,7 @@ class _NewHomeHealthCareStepOnePageState extends State<NewHomeHealthCareStepOneP
decoration: BoxDecoration( decoration: BoxDecoration(
border: Border.all(color: Colors.grey, width: 1), border: Border.all(color: Colors.grey, width: 1),
borderRadius: BorderRadius.circular(12), borderRadius: BorderRadius.circular(12),
color: Colors.white), color: Theme.of(context).primaryColor),
child: Column( child: Column(
children: [ children: [
Row( Row(
@ -112,8 +111,9 @@ class _NewHomeHealthCareStepOnePageState extends State<NewHomeHealthCareStepOneP
child: Padding( child: Padding(
padding: const EdgeInsets.all(20.0), padding: const EdgeInsets.all(20.0),
child: Texts( child: Texts(
projectViewModel.isArabic ? service projectViewModel.isArabic
.descriptionN : service.description, ? service.descriptionN
: service.description,
fontSize: 15, fontSize: 15,
), ),
), ),
@ -139,14 +139,14 @@ class _NewHomeHealthCareStepOnePageState extends State<NewHomeHealthCareStepOneP
Container( Container(
width: MediaQuery.of(context).size.width * 0.9, width: MediaQuery.of(context).size.width * 0.9,
child: SecondaryButton( child: SecondaryButton(
label: TranslationBase label: TranslationBase.of(context).next,
.of(context)
.next,
disabled: this disabled: this
.widget .widget
.patientERInsertPresOrderRequestModel .patientERInsertPresOrderRequestModel
.patientERHHCInsertServicesList .patientERHHCInsertServicesList
.length == 0 || widget.model.state == ViewState.BusyLocal, .length ==
0 ||
widget.model.state == ViewState.BusyLocal,
color: Colors.grey[800], color: Colors.grey[800],
loading: widget.model.state == ViewState.BusyLocal, loading: widget.model.state == ViewState.BusyLocal,
onTap: () async { onTap: () async {

@ -87,7 +87,9 @@ class _NewHomeHealthCarePageState extends State<NewHomeHealthCarePage>
if (model.state == ViewState.ErrorLocal) { if (model.state == ViewState.ErrorLocal) {
Utils.showErrorToast(model.error); Utils.showErrorToast(model.error);
} else { } else {
AppToast.showSuccessToast(message:TranslationBase.of(context).processDoneSuccessfully ); AppToast.showSuccessToast(
message:
TranslationBase.of(context).processDoneSuccessfully);
await model.getHHCAllPresOrders(); await model.getHHCAllPresOrders();
// await model.getHHCAllServices(); // await model.getHHCAllServices();
} }
@ -105,7 +107,9 @@ class _NewHomeHealthCarePageState extends State<NewHomeHealthCarePage>
child: Column( child: Column(
children: [ children: [
Container( Container(
margin: EdgeInsets.only(left: MediaQuery.of(context).size.width*0.05, right: MediaQuery.of(context).size.width*0.05), margin: EdgeInsets.only(
left: MediaQuery.of(context).size.width * 0.05,
right: MediaQuery.of(context).size.width * 0.05),
child: StepsWidget( child: StepsWidget(
index: _currentIndex, index: _currentIndex,
changeCurrentTab: _changeCurrentTab, changeCurrentTab: _changeCurrentTab,
@ -130,11 +134,13 @@ class _NewHomeHealthCarePageState extends State<NewHomeHealthCarePage>
width: double.infinity, width: double.infinity,
margin: EdgeInsets.only(top: 15), margin: EdgeInsets.only(top: 15),
decoration: BoxDecoration( decoration: BoxDecoration(
border: Border.all(color: Colors.grey, width: 1), border: Border.all(
color: Colors.grey, width: 1),
borderRadius: BorderRadius.circular(12), borderRadius: BorderRadius.circular(12),
color: Colors.white), color: Theme.of(context).primaryColor),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment:
CrossAxisAlignment.start,
children: [ children: [
SizedBox( SizedBox(
height: 12, height: 12,
@ -142,7 +148,10 @@ class _NewHomeHealthCarePageState extends State<NewHomeHealthCarePage>
Container( Container(
width: double.infinity, width: double.infinity,
padding: EdgeInsets.only( padding: EdgeInsets.only(
left: 15, bottom: 15, top: 15,right: 15), left: 15,
bottom: 15,
top: 15,
right: 15),
decoration: BoxDecoration( decoration: BoxDecoration(
border: Border( border: Border(
bottom: BorderSide( bottom: BorderSide(
@ -151,13 +160,14 @@ class _NewHomeHealthCarePageState extends State<NewHomeHealthCarePage>
), ),
), ),
// borderRadius: BorderRadius.circular(12), // borderRadius: BorderRadius.circular(12),
color: Colors.white), color:
Theme.of(context).primaryColor),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment:
CrossAxisAlignment.start,
children: [ children: [
Texts( Texts(
TranslationBase TranslationBase.of(context)
.of(context)
.requestID, .requestID,
bold: false, bold: false,
fontSize: 13, fontSize: 13,
@ -166,7 +176,8 @@ class _NewHomeHealthCarePageState extends State<NewHomeHealthCarePage>
height: 4, height: 4,
), ),
Texts( Texts(
widget.model.pendingOrder.iD.toString(), widget.model.pendingOrder.iD
.toString(),
fontSize: 22, fontSize: 22,
), ),
], ],
@ -175,7 +186,10 @@ class _NewHomeHealthCarePageState extends State<NewHomeHealthCarePage>
Container( Container(
width: double.infinity, width: double.infinity,
padding: EdgeInsets.only( padding: EdgeInsets.only(
left: 15, bottom: 15, top: 15,right: 15), left: 15,
bottom: 15,
top: 15,
right: 15),
decoration: BoxDecoration( decoration: BoxDecoration(
border: Border( border: Border(
bottom: BorderSide( bottom: BorderSide(
@ -184,13 +198,14 @@ class _NewHomeHealthCarePageState extends State<NewHomeHealthCarePage>
), ),
), ),
// borderRadius: BorderRadius.circular(12), // borderRadius: BorderRadius.circular(12),
color: Colors.white), color:
Theme.of(context).primaryColor),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment:
CrossAxisAlignment.start,
children: [ children: [
Texts( Texts(
TranslationBase TranslationBase.of(context)
.of(context)
.OrderStatus, .OrderStatus,
bold: false, bold: false,
fontSize: 13, fontSize: 13,
@ -199,11 +214,11 @@ class _NewHomeHealthCarePageState extends State<NewHomeHealthCarePage>
height: 4, height: 4,
), ),
Texts( Texts(
projectViewModel.isArabic
projectViewModel.isArabic ? widget ? widget.model.pendingOrder
.model.pendingOrder .descriptionN
.descriptionN : widget.model : widget.model.pendingOrder
.pendingOrder.description, .description,
fontSize: 22, fontSize: 22,
), ),
], ],
@ -212,7 +227,10 @@ class _NewHomeHealthCarePageState extends State<NewHomeHealthCarePage>
Container( Container(
width: double.infinity, width: double.infinity,
padding: EdgeInsets.only( padding: EdgeInsets.only(
left: 15, bottom: 15, top: 15,right: 15), left: 15,
bottom: 15,
top: 15,
right: 15),
decoration: BoxDecoration( decoration: BoxDecoration(
border: Border( border: Border(
bottom: BorderSide( bottom: BorderSide(
@ -221,12 +239,15 @@ class _NewHomeHealthCarePageState extends State<NewHomeHealthCarePage>
), ),
), ),
// borderRadius: BorderRadius.circular(12), // borderRadius: BorderRadius.circular(12),
color: Colors.white), color:
Theme.of(context).primaryColor),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment:
CrossAxisAlignment.start,
children: [ children: [
Texts( Texts(
TranslationBase.of(context).pickupDate, TranslationBase.of(context)
.pickupDate,
bold: false, bold: false,
fontSize: 13, fontSize: 13,
), ),
@ -234,9 +255,14 @@ class _NewHomeHealthCarePageState extends State<NewHomeHealthCarePage>
height: 4, height: 4,
), ),
Texts( Texts(
DateUtil.getDayMonthYearDateFormatted( DateUtil
DateUtil.convertStringToDate(widget .getDayMonthYearDateFormatted(
.model.pendingOrder.createdOn)), DateUtil
.convertStringToDate(
widget
.model
.pendingOrder
.createdOn)),
fontSize: 22, fontSize: 22,
), ),
], ],
@ -247,7 +273,10 @@ class _NewHomeHealthCarePageState extends State<NewHomeHealthCarePage>
(index) => Container( (index) => Container(
width: double.infinity, width: double.infinity,
padding: EdgeInsets.only( padding: EdgeInsets.only(
left: 15, bottom: 15, top: 15,right: 15), left: 15,
bottom: 15,
top: 15,
right: 15),
decoration: BoxDecoration( decoration: BoxDecoration(
border: Border( border: Border(
bottom: BorderSide( bottom: BorderSide(
@ -256,14 +285,14 @@ class _NewHomeHealthCarePageState extends State<NewHomeHealthCarePage>
), ),
), ),
// borderRadius: BorderRadius.circular(12), // borderRadius: BorderRadius.circular(12),
color: Colors.white), color: Theme.of(context)
.primaryColor),
child: Column( child: Column(
crossAxisAlignment: crossAxisAlignment:
CrossAxisAlignment.start, CrossAxisAlignment.start,
children: [ children: [
Texts( Texts(
TranslationBase TranslationBase.of(context)
.of(context)
.serviceName, .serviceName,
bold: false, bold: false,
fontSize: 13, fontSize: 13,
@ -273,11 +302,15 @@ class _NewHomeHealthCarePageState extends State<NewHomeHealthCarePage>
), ),
Texts( Texts(
projectViewModel.isArabic projectViewModel.isArabic
? widget.model ? widget
.hhcAllOrderDetail[index] .model
.hhcAllOrderDetail[
index]
.descriptionN .descriptionN
: widget.model : widget
.hhcAllOrderDetail[index] .model
.hhcAllOrderDetail[
index]
.description, .description,
fontSize: 22, fontSize: 22,
bold: true, bold: true,
@ -291,18 +324,24 @@ class _NewHomeHealthCarePageState extends State<NewHomeHealthCarePage>
), ),
Center( Center(
child: Container( child: Container(
width: width: MediaQuery.of(context)
MediaQuery.of(context).size.width * 0.85, .size
.width *
0.85,
child: SecondaryButton( child: SecondaryButton(
label: TranslationBase.of(context).cancel.toUpperCase(), label: TranslationBase.of(context)
.cancel
.toUpperCase(),
onTap: () { onTap: () {
showConfirmMessage(widget.model, showConfirmMessage(
widget.model.hhcAllOrderDetail[0]); widget.model,
widget.model
.hhcAllOrderDetail[0]);
}, },
color: Colors.red[800], color: Colors.red[800],
disabled: false, disabled: false,
textColor: textColor: Theme.of(context)
Theme.of(context).backgroundColor), .backgroundColor),
), ),
), ),
SizedBox( SizedBox(
@ -315,22 +354,24 @@ class _NewHomeHealthCarePageState extends State<NewHomeHealthCarePage>
) )
: NewHomeHealthCareStepOnePage( : NewHomeHealthCareStepOnePage(
changePageViewIndex: _changeCurrentTab, changePageViewIndex: _changeCurrentTab,
patientERInsertPresOrderRequestModel: patientERInsertPresOrderRequestModel, patientERInsertPresOrderRequestModel:
patientERInsertPresOrderRequestModel,
model: widget.model, model: widget.model,
), ),
NewHomeHealthCareStepTowPage( NewHomeHealthCareStepTowPage(
latitude: _latitude, latitude: _latitude,
longitude: _longitude, longitude: _longitude,
changePageViewIndex: _changeCurrentTab, changePageViewIndex: _changeCurrentTab,
patientERInsertPresOrderRequestModel: patientERInsertPresOrderRequestModel, patientERInsertPresOrderRequestModel:
patientERInsertPresOrderRequestModel,
model: widget.model, model: widget.model,
), ),
NewHomeHealthCareStepThreePage( NewHomeHealthCareStepThreePage(
changePageViewIndex: _changeCurrentTab, changePageViewIndex: _changeCurrentTab,
patientERInsertPresOrderRequestModel: patientERInsertPresOrderRequestModel, patientERInsertPresOrderRequestModel:
patientERInsertPresOrderRequestModel,
model: widget.model, model: widget.model,
) )
], ],
), ),
), ),

@ -37,15 +37,19 @@ class _HomeHealthCarePageState extends State<HomeHealthCarePage>
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return BaseView<HomeHealthCareViewModel>( return BaseView<HomeHealthCareViewModel>(
onModelReady: (model){ onModelReady: (model) {
model.getHHCAllPresOrders(); model.getHHCAllPresOrders();
}, },
builder: (_, model, widget) => AppScaffold( builder: (_, model, widget) => AppScaffold(
isShowAppBar: true, isShowAppBar: true,
description: TranslationBase.of(context).HHCNotAuthMsg, description: TranslationBase.of(context).HHCNotAuthMsg,
appBarTitle: TranslationBase.of(context).homeHealthCare, appBarTitle: TranslationBase.of(context).homeHealthCare,
imagesInfo: [ImagesInfo(imageAr: 'assets/images/Wifi-AR.png',imageEn: 'assets/images/wifi-EN.png', isAsset: true)], imagesInfo: [
ImagesInfo(
imageAr: 'assets/images/Wifi-AR.png',
imageEn: 'assets/images/wifi-EN.png',
isAsset: true)
],
body: Scaffold( body: Scaffold(
extendBodyBehindAppBar: true, extendBodyBehindAppBar: true,
appBar: PreferredSize( appBar: PreferredSize(
@ -77,7 +81,7 @@ class _HomeHealthCarePageState extends State<HomeHealthCarePage>
color: Theme.of(context).dividerColor, color: Theme.of(context).dividerColor,
width: 0.7), width: 0.7),
), ),
color: Colors.white), color: Theme.of(context).primaryColor),
child: Center( child: Center(
child: TabBar( child: TabBar(
isScrollable: true, isScrollable: true,
@ -93,13 +97,19 @@ class _HomeHealthCarePageState extends State<HomeHealthCarePage>
Container( Container(
width: MediaQuery.of(context).size.width * 0.37, width: MediaQuery.of(context).size.width * 0.37,
child: Center( child: Center(
child: Texts(TranslationBase.of(context).homeHealthCare), child: Texts(
TranslationBase.of(context).homeHealthCare,
color: Colors.black,
),
), ),
), ),
Container( Container(
width: MediaQuery.of(context).size.width * 0.37, width: MediaQuery.of(context).size.width * 0.37,
child: Center( child: Center(
child: Texts(TranslationBase.of(context).orderLog), child: Texts(
TranslationBase.of(context).orderLog,
color: Colors.black,
),
), ),
), ),
], ],

@ -58,8 +58,12 @@ class _AllHabibMedicalServiceState extends State<AllHabibMedicalService> {
@override @override
void initState() { void initState() {
WidgetsBinding.instance.addPostFrameCallback((timeStamp) { WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
locationUtils = new LocationUtils(isShowConfirmDialog: true, context: context); locationUtils =
WidgetsBinding.instance.addPostFrameCallback((_) => {Geolocator.getLastKnownPosition().then((value) => setLocation(value))}); new LocationUtils(isShowConfirmDialog: true, context: context);
WidgetsBinding.instance.addPostFrameCallback((_) => {
Geolocator.getLastKnownPosition()
.then((value) => setLocation(value))
});
}); });
super.initState(); super.initState();
} }
@ -98,12 +102,14 @@ class _AllHabibMedicalServiceState extends State<AllHabibMedicalService> {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Texts( Texts(
TranslationBase.of(context).healthWeatherIndicators, TranslationBase.of(context)
.healthWeatherIndicators,
color: Colors.white, color: Colors.white,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
), ),
Texts( Texts(
TranslationBase.of(context).healthTipsBasedOnCurrentWeather, TranslationBase.of(context)
.healthTipsBasedOnCurrentWeather,
color: Colors.white, color: Colors.white,
fontSize: 14, fontSize: 14,
), ),
@ -131,7 +137,11 @@ class _AllHabibMedicalServiceState extends State<AllHabibMedicalService> {
width: 60, width: 60,
height: 60, height: 60,
), ),
Directionality(textDirection: TextDirection.ltr, child: AppText(weather, fontSize: 22, color: Colors.white)) Directionality(
textDirection: TextDirection.ltr,
child: AppText(weather,
fontSize: 22,
color: Colors.white))
], ],
), ),
Texts( Texts(
@ -151,7 +161,8 @@ class _AllHabibMedicalServiceState extends State<AllHabibMedicalService> {
Navigator.pop(context); Navigator.pop(context);
widget.goToMyProfile(); widget.goToMyProfile();
}, },
imageLocation: 'assets/images/new-design/my_file_bottom_bar.png', imageLocation:
'assets/images/new-design/my_file_bottom_bar.png',
title: TranslationBase.of(context).myMedicalFile, title: TranslationBase.of(context).myMedicalFile,
), ),
ServicesContainer( ServicesContainer(
@ -173,7 +184,8 @@ class _AllHabibMedicalServiceState extends State<AllHabibMedicalService> {
), ),
), ),
), ),
imageLocation: 'assets/images/new-design/booking_icon_active.png', imageLocation:
'assets/images/new-design/booking_icon_active.png',
title: TranslationBase.of(context).bookAppo, title: TranslationBase.of(context).bookAppo,
), ),
ServicesContainer( ServicesContainer(
@ -183,15 +195,28 @@ class _AllHabibMedicalServiceState extends State<AllHabibMedicalService> {
page: PaymentService(), page: PaymentService(),
), ),
), ),
imageLocation: 'assets/images/al-habib_online_payment_service_icon.png', imageLocation:
'assets/images/al-habib_online_payment_service_icon.png',
title: TranslationBase.of(context).onlinePaymentService, title: TranslationBase.of(context).onlinePaymentService,
), ),
ServicesContainer(
onTap: () => Navigator.push(
context,
FadePage(
page: PaymentService(),
),
),
imageLocation:
'assets/images/comprehensive_medical_checkup_logo.png',
title: TranslationBase.of(context).anicllaryOrders,
),
ServicesContainer( ServicesContainer(
onTap: () => Navigator.push( onTap: () => Navigator.push(
context, context,
FadePage(), FadePage(),
), ),
imageLocation: 'assets/images/al-habib_online_payment_service_icon.png', imageLocation:
'assets/images/al-habib_online_payment_service_icon.png',
title: TranslationBase.of(context).covid19_driveThrueTest, title: TranslationBase.of(context).covid19_driveThrueTest,
), ),
ServicesContainer( ServicesContainer(
@ -224,13 +249,17 @@ class _AllHabibMedicalServiceState extends State<AllHabibMedicalService> {
page: InsuranceUpdate(), page: InsuranceUpdate(),
), ),
), ),
imageLocation: 'assets/images/medical/insurance_card_icon.png', imageLocation:
'assets/images/medical/insurance_card_icon.png',
title: TranslationBase.of(context).updateInsurance, title: TranslationBase.of(context).updateInsurance,
), ),
ServicesContainer( ServicesContainer(
onTap: () => Navigator.push( onTap: () => Navigator.push(
context, context,
FadePage(page: authUser.patientID == null ? EReferralIndexPage() : EReferralPage()), FadePage(
page: authUser.patientID == null
? EReferralIndexPage()
: EReferralPage()),
), ),
imageLocation: 'assets/images/ereferral_service_icon.png', imageLocation: 'assets/images/ereferral_service_icon.png',
title: TranslationBase.of(context).ereferral, title: TranslationBase.of(context).ereferral,
@ -242,7 +271,8 @@ class _AllHabibMedicalServiceState extends State<AllHabibMedicalService> {
page: MyFamily(), page: MyFamily(),
), ),
), ),
imageLocation: 'assets/images/new-design/family_menu_icon_red.png', imageLocation:
'assets/images/new-design/family_menu_icon_red.png',
title: TranslationBase.of(context).myFamily, title: TranslationBase.of(context).myFamily,
), ),
if (projectViewModel.havePrivilege(35)) if (projectViewModel.havePrivilege(35))
@ -251,7 +281,8 @@ class _AllHabibMedicalServiceState extends State<AllHabibMedicalService> {
context, context,
FadePage(page: ChildVaccinesPage()), FadePage(page: ChildVaccinesPage()),
), ),
imageLocation: 'assets/images/new-design/children_vaccines_icon.png', imageLocation:
'assets/images/new-design/children_vaccines_icon.png',
title: TranslationBase.of(context).childVaccine, title: TranslationBase.of(context).childVaccine,
), ),
ServicesContainer( ServicesContainer(
@ -261,7 +292,8 @@ class _AllHabibMedicalServiceState extends State<AllHabibMedicalService> {
page: ToDo(isShowAppBar: true), page: ToDo(isShowAppBar: true),
), ),
), ),
imageLocation: 'assets/images/new-design/upcoming_icon_bottom_bar.png', imageLocation:
'assets/images/new-design/upcoming_icon_bottom_bar.png',
title: TranslationBase.of(context).todoList, title: TranslationBase.of(context).todoList,
), ),
if (projectViewModel.havePrivilege(42)) if (projectViewModel.havePrivilege(42))
@ -288,7 +320,8 @@ class _AllHabibMedicalServiceState extends State<AllHabibMedicalService> {
page: (HealthCalculators()), page: (HealthCalculators()),
), ),
), ),
imageLocation: 'assets/images/new-design/health_calculator_icon.png', imageLocation:
'assets/images/new-design/health_calculator_icon.png',
title: TranslationBase.of(context).calculators, title: TranslationBase.of(context).calculators,
), ),
ServicesContainer( ServicesContainer(
@ -298,12 +331,14 @@ class _AllHabibMedicalServiceState extends State<AllHabibMedicalService> {
page: HealthConverter(), page: HealthConverter(),
), ),
), ),
imageLocation: 'assets/images/new-design/health_convertor_icon.png', imageLocation:
'assets/images/new-design/health_convertor_icon.png',
title: TranslationBase.of(context).converters, title: TranslationBase.of(context).converters,
), ),
if (projectViewModel.havePrivilege(38)) if (projectViewModel.havePrivilege(38))
ServicesContainer( ServicesContainer(
onTap: () => Navigator.push(context, FadePage(page: H2OPage())), onTap: () =>
Navigator.push(context, FadePage(page: H2OPage())),
// Navigator.push( // Navigator.push(
// context, // context,
// FadePage( // FadePage(
@ -319,7 +354,8 @@ class _AllHabibMedicalServiceState extends State<AllHabibMedicalService> {
context, context,
FadePage(), FadePage(),
), ),
imageLocation: 'assets/images/new-design/smartwatch_icon.png', imageLocation:
'assets/images/new-design/smartwatch_icon.png',
title: TranslationBase.of(context).smartWatches, title: TranslationBase.of(context).smartWatches,
), ),
ServicesContainer( ServicesContainer(
@ -329,12 +365,15 @@ class _AllHabibMedicalServiceState extends State<AllHabibMedicalService> {
page: ParkingPage(), page: ParkingPage(),
), ),
), ),
imageLocation: 'assets/images/new-design/parking_system_icon.png', imageLocation:
'assets/images/new-design/parking_system_icon.png',
title: TranslationBase.of(context).parking, title: TranslationBase.of(context).parking,
), ),
ServicesContainer( ServicesContainer(
onTap: () => launch("https://hmgwebservices.com/vt_mobile/html/index.html"), onTap: () => launch(
imageLocation: 'assets/images/new-design/virtual_tour_icon.png', "https://hmgwebservices.com/vt_mobile/html/index.html"),
imageLocation:
'assets/images/new-design/virtual_tour_icon.png',
title: TranslationBase.of(context).vTour, title: TranslationBase.of(context).vTour,
), ),
ServicesContainer( ServicesContainer(
@ -342,10 +381,12 @@ class _AllHabibMedicalServiceState extends State<AllHabibMedicalService> {
Navigator.of(context).push(MaterialPageRoute( Navigator.of(context).push(MaterialPageRoute(
builder: (BuildContext context) => MyWebView( builder: (BuildContext context) => MyWebView(
title: "HMG News", title: "HMG News",
selectedUrl: "https://twitter.com/hashtag/مجموعة_د_سليمان_الحبيب_الطبية?src=hashtag_click&f=live", selectedUrl:
"https://twitter.com/hashtag/مجموعة_د_سليمان_الحبيب_الطبية?src=hashtag_click&f=live",
))); )));
}, },
imageLocation: 'assets/images/new-design/twitter_dashboard_icon.png', imageLocation:
'assets/images/new-design/twitter_dashboard_icon.png',
title: TranslationBase.of(context).latestNews, title: TranslationBase.of(context).latestNews,
), ),
ServicesContainer( ServicesContainer(
@ -368,7 +409,8 @@ class _AllHabibMedicalServiceState extends State<AllHabibMedicalService> {
getAuthUser() async { getAuthUser() async {
if (await this.sharedPref.getObject(USER_PROFILE) != null) { if (await this.sharedPref.getObject(USER_PROFILE) != null) {
var data = AuthenticatedUser.fromJson(await this.sharedPref.getObject(USER_PROFILE)); var data = AuthenticatedUser.fromJson(
await this.sharedPref.getObject(USER_PROFILE));
setState(() { setState(() {
authUser = data; authUser = data;
}); });
@ -382,7 +424,8 @@ class _AllHabibMedicalServiceState extends State<AllHabibMedicalService> {
}); });
} else { } else {
setState(() { setState(() {
weather = data != null ? data['Temperature'].toString() + '\u2103' : '--'; weather =
data != null ? data['Temperature'].toString() + '\u2103' : '--';
}); });
} }
} }

@ -0,0 +1,43 @@
import 'package:diplomaticquarterapp/core/viewModels/ancillary_orders_view_model.dart';
import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/health_calculator/body_fat/body_fat.dart';
import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/health_calculator/bmi_calculator/bmi_calculator.dart';
import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/health_calculator/calorie_calculator/calorie_calculator.dart';
import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/health_calculator/carbs/carbs.dart';
import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/health_calculator/ovulation_period/ovulation_period.dart';
import 'package:diplomaticquarterapp/pages/base/base_view.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/widgets/data_display/medical/medical_profile_item.dart';
import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
import 'package:flutter/material.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
class AnicllaryOrders extends StatefulWidget {
@override
_AnicllaryOrdersState createState() => _AnicllaryOrdersState();
}
class _AnicllaryOrdersState extends State<AnicllaryOrders>
with SingleTickerProviderStateMixin {
TabController _tabController;
void initState() {
super.initState();
_tabController = TabController(length: 2, vsync: this);
}
void dispose() {
super.dispose();
_tabController.dispose();
}
@override
Widget build(BuildContext context) {
return BaseView<AnciallryOrdersViewModel>(
onModelReady: (model) => model.getOrders(),
builder: (_, model, widget) => AppScaffold(
isShowAppBar: true,
appBarTitle: TranslationBase.of(context).parking,
body: SingleChildScrollView(
padding: EdgeInsets.all(12), child: Container())));
}
}

@ -66,7 +66,7 @@ class _HealthCalculatorsState extends State<HealthCalculators>
isScrollable: true, isScrollable: true,
indicatorWeight: 4.0, indicatorWeight: 4.0,
indicatorColor: Colors.red, indicatorColor: Colors.red,
labelColor: Theme.of(context).primaryColor, labelColor: Theme.of(context).buttonColor,
labelPadding: labelPadding:
EdgeInsets.symmetric(horizontal: 13.0, vertical: 2.0), EdgeInsets.symmetric(horizontal: 13.0, vertical: 2.0),
unselectedLabelColor: Colors.grey, unselectedLabelColor: Colors.grey,
@ -74,13 +74,15 @@ class _HealthCalculatorsState extends State<HealthCalculators>
Container( Container(
width: MediaQuery.of(context).size.width * 0.35, width: MediaQuery.of(context).size.width * 0.35,
child: Center( child: Center(
child: Texts(TranslationBase.of(context).generalHealth), child: Texts(
TranslationBase.of(context).generalHealth),
), ),
), ),
Container( Container(
width: MediaQuery.of(context).size.width * 0.35, width: MediaQuery.of(context).size.width * 0.35,
child: Center( child: Center(
child: Texts(TranslationBase.of(context).womanHealth), child:
Texts(TranslationBase.of(context).womanHealth),
), ),
), ),
], ],
@ -119,7 +121,8 @@ class _HealthCalculatorsState extends State<HealthCalculators>
child: MedicalProfileItem( child: MedicalProfileItem(
title: TranslationBase.of(context).bmi, title: TranslationBase.of(context).bmi,
imagePath: 'bmi_health_calculator.png', imagePath: 'bmi_health_calculator.png',
subTitle: TranslationBase.of(context).calcHealth, subTitle:
TranslationBase.of(context).calcHealth,
), ),
), ),
), ),
@ -137,7 +140,8 @@ class _HealthCalculatorsState extends State<HealthCalculators>
child: MedicalProfileItem( child: MedicalProfileItem(
title: TranslationBase.of(context).calories, title: TranslationBase.of(context).calories,
imagePath: 'calories-calculator.png', imagePath: 'calories-calculator.png',
subTitle: TranslationBase.of(context).calcHealth, subTitle:
TranslationBase.of(context).calcHealth,
), ),
), ),
), ),
@ -159,7 +163,8 @@ class _HealthCalculatorsState extends State<HealthCalculators>
child: MedicalProfileItem( child: MedicalProfileItem(
title: TranslationBase.of(context).bmr, title: TranslationBase.of(context).bmr,
imagePath: 'BMR_calculator.png', imagePath: 'BMR_calculator.png',
subTitle: TranslationBase.of(context).calcHealth, subTitle:
TranslationBase.of(context).calcHealth,
), ),
), ),
), ),
@ -215,9 +220,11 @@ class _HealthCalculatorsState extends State<HealthCalculators>
); );
}, },
child: MedicalProfileItem( child: MedicalProfileItem(
title: TranslationBase.of(context).carbohydrate, title:
TranslationBase.of(context).carbohydrate,
imagePath: 'carb_protein.png', imagePath: 'carb_protein.png',
subTitle: TranslationBase.of(context).proteinFat, subTitle:
TranslationBase.of(context).proteinFat,
), ),
), ),
), ),

@ -101,7 +101,7 @@ class _BloodDonationPageState extends State<BloodDonationPage> {
height: 65, height: 65,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(12), borderRadius: BorderRadius.circular(12),
color: Colors.white), color: Theme.of(context).primaryColor),
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
@ -124,7 +124,7 @@ class _BloodDonationPageState extends State<BloodDonationPage> {
height: 65, height: 65,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(12), borderRadius: BorderRadius.circular(12),
color: Colors.white), color: Theme.of(context).primaryColor),
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
@ -148,7 +148,7 @@ class _BloodDonationPageState extends State<BloodDonationPage> {
height: 65, height: 65,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(12), borderRadius: BorderRadius.circular(12),
color: Colors.white), color: Theme.of(context).primaryColor),
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
@ -228,7 +228,7 @@ class _BloodDonationPageState extends State<BloodDonationPage> {
children: [ children: [
Center( Center(
child: Container( child: Container(
color: Colors.white, color: Theme.of(context).primaryColor,
width: 350, width: 350,
child: InkWell( child: InkWell(
onTap: () { onTap: () {

@ -48,11 +48,11 @@ class MyBalancePage extends StatelessWidget {
children: [ children: [
Texts( Texts(
TranslationBase.of(context).totalBalance, TranslationBase.of(context).totalBalance,
color: Colors.white, color: Theme.of(context).primaryColor,
), ),
Texts( Texts(
'${model.totalAdvanceBalanceAmount ?? 0} SAR', '${model.totalAdvanceBalanceAmount ?? 0} SAR',
color: Colors.white, color: Theme.of(context).primaryColor,
bold: true, bold: true,
), ),
], ],
@ -68,7 +68,7 @@ class MyBalancePage extends StatelessWidget {
height: 65, height: 65,
margin: EdgeInsets.only(top: 8), margin: EdgeInsets.only(top: 8),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.white, color: Theme.of(context).primaryColor,
shape: BoxShape.rectangle, shape: BoxShape.rectangle,
borderRadius: BorderRadius.circular(7), borderRadius: BorderRadius.circular(7),
), ),

@ -315,7 +315,8 @@ class _SearchByClinicState extends State<SearchByClinic> {
isLiveCareAppointment: false, isLiveCareAppointment: false,
doctorsList: docList, doctorsList: docList,
patientDoctorAppointmentListHospital: patientDoctorAppointmentListHospital:
patientDoctorAppointmentListHospital))).then((value) { patientDoctorAppointmentListHospital)))
.then((value) {
getProjectsList(); getProjectsList();
}); });
} }

@ -0,0 +1,76 @@
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
class ConfirmExitPageDialog extends StatelessWidget {
final GestureTapCallback onTapYes;
final GestureTapCallback onTapNo;
const ConfirmExitPageDialog({Key key, this.onTapYes, this.onTapNo})
: super(key: key);
@override
Widget build(BuildContext context) {
return SimpleDialog(
contentPadding: EdgeInsets.fromLTRB(28.0, 24.0, 28.0, 0.0),
title: Center(
child: Texts(
TranslationBase.of(context).confirm,
color: Colors.black,
),
),
children: [
Column(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Texts(
"Are you sure you want to exit this page ?",
color: Colors.grey,
),
SizedBox(
height: 5,
),
Divider(),
SizedBox(
height: 5.0,
),
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
InkWell(
onTap: () {
onTapNo();
},
child: Container(
child: Center(
child: Texts(
TranslationBase.of(context).no,
color: Colors.red,
),
),
),
),
InkWell(
onTap: () {
Navigator.pop(context);
onTapYes();
},
child: Container(
child: Center(
child: Texts(TranslationBase.of(context).yes),
),
),
),
],
),
SizedBox(
height: 20.0,
),
],
)
],
);
}
}

@ -0,0 +1,120 @@
import 'package:diplomaticquarterapp/core/model/er/TriageInformationRequest.dart';
import 'package:diplomaticquarterapp/core/model/er/TriageQuestionsModel.dart';
import 'package:diplomaticquarterapp/core/model/hospitals/hospitals_model.dart';
import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'EdOnlineAgreementPage.dart';
import 'EdOnlineNotesPage.dart';
import 'EdOnlineQuestionsPage.dart';
import 'EdOnlineSelectedHospitalPage.dart';
import 'EdPaymentInformationPage.dart';
import 'ConfirmExitPageDialog.dart';
class DdServicesPage extends StatefulWidget {
@override
_DdServicesPageState createState() => _DdServicesPageState();
}
class _DdServicesPageState extends State<DdServicesPage> {
PageController pageController;
bool isAgree = false;
TriageInformationRequest triageInformationRequest = new TriageInformationRequest();
List<TriageQuestionsModel> selectedQuestions = List();
@override
void initState() {
super.initState();
pageController = new PageController();
}
_changePageViewIndex(int tab) {
setState(() {
pageController.jumpToPage(tab);
pageController.animateToPage(tab,
duration: Duration(milliseconds: 800), curve: Curves.easeOutQuart);
});
}
@override
Widget build(BuildContext context) {
ProjectViewModel projectViewModel = Provider.of(context);
return Scaffold(
appBar: AppBar(
elevation: 0,
textTheme: TextTheme(
headline6: TextStyle(
color: Theme.of(context).textTheme.headline1.color,
fontWeight: FontWeight.bold),
),
title: Text(
'ED Online',
style: TextStyle(
fontWeight: FontWeight.bold,
color: Theme.of(context).textTheme.headline1.color,
fontFamily: projectViewModel.isArabic ? 'Cairo' : 'WorkSans'),
// bold: true,
// color: Colors.white,
),
leading: Builder(
builder: (BuildContext context) {
return IconButton(
icon: Icon(Icons.arrow_back),
color: Theme.of(context).textTheme.headline1.color,
onPressed: () {
showConfirmMessage(context);
},
);
},
),
centerTitle: true,
),
body: PageView(
physics: NeverScrollableScrollPhysics(),
controller: pageController,
onPageChanged: _changePageViewIndex,
children: [
EdOnlineSelectedHospitalPage(
changePageViewIndex: _changePageViewIndex,
triageInformationRequest: triageInformationRequest,
),
EdOnlineAgreementPage(
changePageViewIndex: _changePageViewIndex,
isAgree: isAgree,
),
EdOnlineQuestionsPage(
changePageViewIndex: _changePageViewIndex,
selectedQuestions: selectedQuestions,
),
EdOnlineNotesPage(
changePageViewIndex: _changePageViewIndex,
selectedQuestions: selectedQuestions,
triageInformationRequest: triageInformationRequest,
),
EdPaymentInformationPage(selectedHospital: triageInformationRequest.selectedHospital,)
],
),
);
}
void showConfirmMessage(
BuildContext context,
) {
showDialog(
context: context,
child: ConfirmExitPageDialog(
onTapYes: () {
Navigator.pop(context);
},
onTapNo: () {
Navigator.pop(context);
},
),
);
}
}

@ -0,0 +1,99 @@
import 'package:diplomaticquarterapp/core/model/hospitals/hospitals_model.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.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/cupertino.dart';
import 'package:flutter/material.dart';
class EdOnlineAgreementPage extends StatefulWidget {
final HospitalsModel selectedHospital;
final Function changePageViewIndex;
bool isAgree;
EdOnlineAgreementPage({Key key, this.selectedHospital, this.changePageViewIndex,this.isAgree}) : super(key: key);
@override
_EdOnlineAgreementPageState createState() => _EdOnlineAgreementPageState();
}
class _EdOnlineAgreementPageState extends State<EdOnlineAgreementPage> {
@override
Widget build(BuildContext context) {
return AppScaffold(
body: SingleChildScrollView(
physics: BouncingScrollPhysics(),
child: Column(
children: [
SizedBox(),
InkWell(
onTap: (){
setState(() {
widget.isAgree = !widget.isAgree;
});
},
child: Row(
children: [
Checkbox(
value: widget.isAgree,
activeColor: Colors.red[800],
onChanged: (bool newValue) {
setState(() {
widget.isAgree = !widget.isAgree;
});
}),
Expanded(
child: Padding(
padding: const EdgeInsets.all(20.0),
child: Texts(
TranslationBase.of(context).onlineCheckInAgreement,
fontSize: 15,
),
),
),
],
),
),
SizedBox(),
],
),
),
bottomSheet: Padding(
padding: const EdgeInsets.all(8.0),
child: Container(
height: 56,
child: Row(
children: [
Expanded(
child: Container(
margin: EdgeInsets.only(left: 5,right: 5),
child: SecondaryButton(
textColor: Colors.white,
color: Theme.of(context).primaryColor,
label: TranslationBase.of(context).back.toUpperCase(),
onTap: () => widget.changePageViewIndex(0),
),
),
),
SizedBox(width: 10,),
Expanded(
child: Container(
margin: EdgeInsets.only(left: 5,right: 5),
child: SecondaryButton(
textColor: Colors.white,
color: Theme.of(context).primaryColor,
label: TranslationBase.of(context).next.toUpperCase(),
disabled: !widget.isAgree,
onTap: () => widget.changePageViewIndex(2),
),
),
),
],
),
),
),
);
}
}

@ -0,0 +1,177 @@
import 'package:diplomaticquarterapp/core/enum/viewstate.dart';
import 'package:diplomaticquarterapp/core/model/er/TriageInformationRequest.dart';
import 'package:diplomaticquarterapp/core/model/er/TriageQuestionsModel.dart';
import 'package:diplomaticquarterapp/core/model/hospitals/hospitals_model.dart';
import 'package:diplomaticquarterapp/core/viewModels/er/EdOnlineViewModel.dart';
import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
import 'package:diplomaticquarterapp/pages/Blood/new_text_Field.dart';
import 'package:diplomaticquarterapp/pages/base/base_view.dart';
import 'package:diplomaticquarterapp/uitl/app_toast.dart';
import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.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/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter_datetime_picker/flutter_datetime_picker.dart';
import 'package:provider/provider.dart';
class EdOnlineNotesPage extends StatefulWidget {
final List<TriageQuestionsModel> selectedQuestions;
final Function changePageViewIndex;
TriageInformationRequest triageInformationRequest;
EdOnlineNotesPage(
{Key key, this.selectedQuestions, this.changePageViewIndex,this.triageInformationRequest})
;
@override
_EdOnlineNotesPageState createState() => _EdOnlineNotesPageState();
}
class _EdOnlineNotesPageState extends State<EdOnlineNotesPage> {
TextEditingController _chiefComplaintsTextController =
TextEditingController();
TextEditingController _noteTextController = TextEditingController();
DateTime selectedTime;
final _formKey = GlobalKey<FormState>();
@override
Widget build(BuildContext context) {
ProjectViewModel projectViewModel = Provider.of(context);
return BaseView<EdOnlineViewModel>(
builder: (_, model, w) => AppScaffold(
baseViewModel: model,
body: SingleChildScrollView(
physics: BouncingScrollPhysics(),
child: Padding(
padding: const EdgeInsets.all(8.0),
child: Column(
children: [
Form(
key: _formKey,
child: NewTextFields(
controller: _chiefComplaintsTextController,
maxLines: 15,
minLines: 5,
hintText: TranslationBase.of(context).chiefComplaints,
validator: (value) {
if (value.isEmpty) return TranslationBase.of(context).errorChiefComplaints;
return null;
},
),
),
SizedBox(
height: 8,
),
InkWell(
onTap: () {
DatePicker.showDateTimePicker(
context,
showTitleActions: true,
minTime: DateTime.now(),
maxTime: DateTime.now().add(Duration(hours: 24)),
onConfirm: (date) {
setState(() {
selectedTime = date;
});
},
currentTime: DateTime.now(),
locale: projectViewModel.localeType,
);
},
child: Container(
padding: EdgeInsets.all(12),
width: double.infinity,
// height: 65,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(12),
color: Colors.white),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Texts(selectedTime == null ?TranslationBase.of(context).errorExpectedArrivalTime:TranslationBase.of(context).expectedArrivalTime),
Texts(getDate(context)),
],
),
),
),
SizedBox(
height: 8,
),
NewTextFields(
controller: _noteTextController,
maxLines: 15,
minLines: 5,
hintText: TranslationBase.of(context).notes,
),
],
),
),
),
bottomSheet: Container(
height: 56,
margin: EdgeInsets.only(bottom: 5),
width: double.infinity,
child: Row(
children: [
Expanded(
child: Container(
margin: EdgeInsets.only(left: 5,right: 5),
child: SecondaryButton(
textColor: Colors.white,
color: Theme.of(context).primaryColor,
label: TranslationBase.of(context).back.toUpperCase(),
onTap: () => widget.changePageViewIndex(2),
),
),
),
SizedBox(width: 10,),
Expanded(
child: Container(
margin: EdgeInsets.only(left: 5,right: 5),
child: SecondaryButton(
textColor: Colors.white,
color: Theme.of(context).primaryColor,
label: TranslationBase.of(context).save.toUpperCase(),
disabled: selectedTime == null,
onTap: () async {
if (_formKey.currentState.validate()) {
GifLoaderDialogUtils.showMyDialog(context);
model.saveQuestionsInformation(
chiefComplaint:
_chiefComplaintsTextController.text.toString(),
notes: _noteTextController.text.toString(),
selectedQuestions: widget.selectedQuestions,
projectId: widget.triageInformationRequest.projectID,selectedTime: selectedTime).then((value) {
GifLoaderDialogUtils.hideDialog(context);
if(model.state == ViewState.ErrorLocal)
AppToast.showErrorToast(message: model.error);
else
{
widget.changePageViewIndex(4);
}
}).catchError((onError){
GifLoaderDialogUtils.hideDialog(context);
AppToast.showErrorToast(message: onError.toString());
});
}
}),
),
),
],
),
),
),
);
}
getDate(BuildContext context) {
String message = "";
if (selectedTime != null) {
message = "${selectedTime.hour}:${selectedTime.minute}";
}
return message;
}
}

@ -0,0 +1,127 @@
import 'package:diplomaticquarterapp/core/model/er/TriageQuestionsModel.dart';
import 'package:diplomaticquarterapp/core/model/hospitals/hospitals_model.dart';
import 'package:diplomaticquarterapp/core/viewModels/er/EdOnlineViewModel.dart';
import 'package:diplomaticquarterapp/pages/base/base_view.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.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/cupertino.dart';
import 'package:flutter/material.dart';
// ignore: must_be_immutable
class EdOnlineQuestionsPage extends StatefulWidget {
final HospitalsModel selectedHospital;
final Function changePageViewIndex;
List<TriageQuestionsModel> selectedQuestions;
EdOnlineQuestionsPage({Key key, this.selectedHospital,this.selectedQuestions, this.changePageViewIndex});
@override
_EdOnlineQuestionsPageState createState() => _EdOnlineQuestionsPageState();
}
class _EdOnlineQuestionsPageState extends State<EdOnlineQuestionsPage> {
@override
Widget build(BuildContext context) {
return BaseView<EdOnlineViewModel>(
onModelReady: (model) => model.getQuestions(),
builder: (_, model, w) => AppScaffold(
baseViewModel: model,
body: SingleChildScrollView(
physics: BouncingScrollPhysics(),
child: Column(
children: [
...List.generate(
model.triageQuestionsModelList.length,
(index) =>
InkWell(
onTap: (){
setState(() {
if (widget.selectedQuestions
.contains(model.triageQuestionsModelList[index])) {
widget.selectedQuestions
.remove(model.triageQuestionsModelList[index]);
} else {
widget.selectedQuestions
.add(model.triageQuestionsModelList[index]);
}
});
},
child: Row(
children: [
Checkbox(
value: widget.selectedQuestions.contains(model.triageQuestionsModelList[index]),
activeColor: Colors.red[800],
onChanged: (bool newValue) {
setState(() {
if (widget.selectedQuestions
.contains(model.triageQuestionsModelList[index])) {
widget.selectedQuestions
.remove(model.triageQuestionsModelList[index]);
} else {
widget.selectedQuestions
.add(model.triageQuestionsModelList[index]);
}
});
}),
Expanded(
child: Padding(
padding: const EdgeInsets.all(20.0),
child: Texts(
model.triageQuestionsModelList[index].question,
fontSize: 15,
),
),
),
],
),
),
),
SizedBox(height: 80,)
],
),
),
bottomSheet: Padding(
padding: const EdgeInsets.all(8.0),
child: Container(
height: 56,
child: Row(
children: [
Expanded(
child: Container(
margin: EdgeInsets.only(left: 5,right: 5),
child: SecondaryButton(
textColor: Colors.white,
color: Theme.of(context).primaryColor,
label: TranslationBase.of(context).back.toUpperCase(),
onTap: () => widget.changePageViewIndex(1),
),
),
),
SizedBox(width: 10,),
Expanded(
child: Container(
margin: EdgeInsets.only(left: 5,right: 5),
child: SecondaryButton(
textColor: Colors.white,
color: Theme.of(context).primaryColor,
label: TranslationBase.of(context).next.toUpperCase(),
disabled: widget.selectedQuestions.isEmpty,
onTap: () => widget.changePageViewIndex(3),
),
),
),
],
),
),
),
),
);
}
}

@ -0,0 +1,102 @@
import 'package:diplomaticquarterapp/core/model/er/TriageInformationRequest.dart';
import 'package:diplomaticquarterapp/core/model/hospitals/hospitals_model.dart';
import 'package:diplomaticquarterapp/core/viewModels/er/EdOnlineViewModel.dart';
import 'package:diplomaticquarterapp/pages/base/base_view.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import '../../../Constants.dart';
class EdOnlineSelectedHospitalPage extends StatefulWidget {
final Function changePageViewIndex;
TriageInformationRequest triageInformationRequest;
EdOnlineSelectedHospitalPage(
{Key key, this.changePageViewIndex,this.triageInformationRequest})
: super(key: key);
@override
_EdOnlineSelectedHospitalPageState createState() =>
_EdOnlineSelectedHospitalPageState();
}
class _EdOnlineSelectedHospitalPageState
extends State<EdOnlineSelectedHospitalPage> {
@override
Widget build(BuildContext context) {
return BaseView<EdOnlineViewModel>(
onModelReady: (model) => model.getHospitals(),
builder: (_, model, w) => AppScaffold(
baseViewModel: model,
body: SingleChildScrollView(
physics: BouncingScrollPhysics(),
child: Column(
children: [
...List.generate(
model.hospitals.length,
(index) => Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
SizedBox(
height: 2,
),
Row(
children: <Widget>[
Expanded(
flex: 1,
child: InkWell(
onTap: () {
setState(() {
widget.triageInformationRequest.selectedHospital = model.hospitals[index];
widget.triageInformationRequest.projectID = model.hospitals[index].iD;
});
},
child: ListTile(
title: Text(model.hospitals[index].name +
' ${model.hospitals[index].distanceInKilometers} ' +
TranslationBase.of(context).km),
leading: Radio(
value: model.hospitals[index],
groupValue: widget.triageInformationRequest.selectedHospital,
activeColor: secondaryColor,
onChanged: (value) {
setState(() {
widget.triageInformationRequest.selectedHospital = model.hospitals[index];
widget.triageInformationRequest.projectID = model.hospitals[index].iD;
});
},
),
),
),
)
],
),
SizedBox(
height: 5.0,
),
],
),
)
],
),
),
bottomSheet: Container(
height: 76,
child: Padding(
padding: const EdgeInsets.all(8.0),
child: SecondaryButton(
// textColor: Colors.white,
color: Theme.of(context).primaryColor,
label: TranslationBase.of(context).next.toUpperCase(),
disabled: widget.triageInformationRequest.selectedHospital==null,
onTap: () => widget.changePageViewIndex(1)),
),
),
),
);
}
}

@ -0,0 +1,112 @@
import 'package:diplomaticquarterapp/core/model/hospitals/hospitals_model.dart';
import 'package:diplomaticquarterapp/core/viewModels/er/EdOnlineViewModel.dart';
import 'package:diplomaticquarterapp/pages/ToDoList/payment_method_select.dart';
import 'package:diplomaticquarterapp/pages/base/base_view.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.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:diplomaticquarterapp/widgets/transitions/fade_page.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
class EdPaymentInformationPage extends StatefulWidget {
final HospitalsModel selectedHospital;
const EdPaymentInformationPage({Key key, this.selectedHospital}) : super(key: key);
@override
_EdPaymentInformationPageState createState() =>
_EdPaymentInformationPageState();
}
class _EdPaymentInformationPageState extends State<EdPaymentInformationPage> {
@override
Widget build(BuildContext context) {
return BaseView<EdOnlineViewModel>(
onModelReady: (model) => model.getPatientPaymentInformation(),
builder: (_, model, w) => AppScaffold(
baseViewModel: model,
body: SingleChildScrollView(
physics: BouncingScrollPhysics(),
child: Column(
children: [
Container(
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(10.0),
color: Colors.white),
margin: EdgeInsets.fromLTRB(0.0, 30.0, 0.0, 5.0),
padding: EdgeInsets.fromLTRB(20.0, 0.0, 20.0, 20.0),
child: Column(
children: <Widget>[
Container(
alignment: Alignment.center,
margin:
EdgeInsets.only(left: 0.0, right: 20.0, top: 30.0),
child: Text(TranslationBase.of(context).testFee,
style: TextStyle(
color: Colors.black,
fontSize: 22.0,
fontWeight: FontWeight.bold)),
),
if(model.erPatientShareModel!=null)
Table(
children: [
TableRow(children: [
TableCell(
child:
Texts(TranslationBase.of(context).testFee)),
TableCell(
child: Texts(model
.erPatientShareModel.patientShare
.toStringAsFixed(2))),
]),
TableRow(children: [
TableCell(
child: Texts(
TranslationBase.of(context).patientTaxToDo)),
TableCell(
child: Texts(model
.erPatientShareModel.patientTaxAmount
.toStringAsFixed(2))),
]),
TableRow(children: [
TableCell(
child: Texts(TranslationBase.of(context)
.patientShareTotalToDo)),
TableCell(
child: Texts(model
.erPatientShareModel.patientShareWithTax
.toStringAsFixed(2))),
]),
],
),
],
),
),
],
),
),
bottomSheet: Container(
height: 76,
child: Padding(
padding: const EdgeInsets.all(8.0),
child: SecondaryButton(
color: Theme.of(context).primaryColor,
label: TranslationBase.of(context).next.toUpperCase(),
onTap: () {
Navigator.push(context, FadePage(page: PaymentMethod())).then(
(value) {
//TODO Haroun call API here
},
);
},
),
),
),
),
);
}
}

@ -1,10 +1,16 @@
import 'package:diplomaticquarterapp/uitl/location_util.dart'; import 'package:diplomaticquarterapp/uitl/location_util.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import '../../uitl/translations_delegate_base.dart'; import '../../uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/pages/ErService/widgets/card_common.dart'; import 'package:diplomaticquarterapp/pages/ErService/widgets/card_common.dart';
import 'AmbulanceReq.dart';
import 'EdOnline/DdServicesPage.dart';
import 'EdOnline/EdOnlineSelectedHospitalPage.dart';
import 'NearestEr.dart';
class ErOptions extends StatefulWidget { class ErOptions extends StatefulWidget {
final bool isAppbar; final bool isAppbar;
@ -49,7 +55,12 @@ class _ErOptionsState extends State<ErOptions> {
image: 'assets/images/new-design/AM.PNG', image: 'assets/images/new-design/AM.PNG',
text: TranslationBase.of(context).ambulancerequest, text: TranslationBase.of(context).ambulancerequest,
subText: TranslationBase.of(context).requestA, subText: TranslationBase.of(context).requestA,
type: 0, onTap: (){
Navigator.push(
context,
FadePage(
page: AmbulanceReq()));
},
), ),
), ),
@ -58,8 +69,39 @@ class _ErOptionsState extends State<ErOptions> {
image: 'assets/images/new-design/emergency_icon.png', image: 'assets/images/new-design/emergency_icon.png',
text: TranslationBase.of(context).nearester, text: TranslationBase.of(context).nearester,
subText: TranslationBase.of(context).locationa, subText: TranslationBase.of(context).locationa,
type: 1), onTap:(){
Navigator.push(
context,
FadePage(
page: NearestEr()));
}),
)
],
),
),
Container(
margin: EdgeInsets.fromLTRB(0.0, 10.0, 0.0, 10.0),
child: Row(
mainAxisSize: MainAxisSize.max,
mainAxisAlignment: MainAxisAlignment.start,
children: <Widget>[
Expanded(
child: CardCommonEr(
image: 'assets/images/new-design/AM.PNG',
text:'ED service',
subText: 'ED service',
onTap: (){
Navigator.push(
context,
FadePage(
page: DdServicesPage()));
},
),
),
Expanded(
child: Container(),
) )
], ],
), ),

@ -10,20 +10,18 @@ class CardCommonEr extends StatelessWidget {
final image; final image;
final text; final text;
final subText; final subText;
final type;
final Function onTap;
const CardCommonEr( const CardCommonEr(
{@required this.image, {@required this.image,
@required this.text, @required this.text,
@required this.subText, @required this.subText,
@required this.type}); @required this.onTap});
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return GestureDetector( return GestureDetector(
onTap: () { onTap: () => onTap(),
navigateToSearch(context, this.type);
},
child: Container( child: Container(
margin: EdgeInsets.fromLTRB(9.0, 9.0, 9.0, 9.0), margin: EdgeInsets.fromLTRB(9.0, 9.0, 9.0, 9.0),
decoration: BoxDecoration(boxShadow: [ decoration: BoxDecoration(boxShadow: [
@ -59,25 +57,4 @@ class CardCommonEr extends StatelessWidget {
); );
} }
Future navigateToSearch(context, type) async {
//===Switch case===
if(type==0)
{
Navigator.push(
context,
FadePage(
page: AmbulanceReq()));
}
else{
Navigator.push(
context,
FadePage(
page: NearestEr()));
}
}
} }

@ -658,10 +658,9 @@ class _ConfirmLogin extends State<ConfirmLogin> {
SizedBox( SizedBox(
height: 20, height: 20,
), ),
Texts( Texts(TranslationBase.of(context).verifyWhatsApp,
TranslationBase.of(context).verifyWhatsApp,
fontSize: SizeConfig.textMultiplier * 2, fontSize: SizeConfig.textMultiplier * 2,
) color: Colors.black)
], ],
), ),
))); )));
@ -690,11 +689,10 @@ class _ConfirmLogin extends State<ConfirmLogin> {
: SizedBox( : SizedBox(
height: 20, height: 20,
), ),
Texts( Texts(TranslationBase.of(context).verifySMS,
TranslationBase.of(context).verifySMS,
fontSize: SizeConfig.textMultiplier * 2, fontSize: SizeConfig.textMultiplier * 2,
textAlign: TextAlign.center, textAlign: TextAlign.center,
) color: Colors.black)
], ],
), ),
))); )));
@ -721,10 +719,9 @@ class _ConfirmLogin extends State<ConfirmLogin> {
SizedBox( SizedBox(
height: 20, height: 20,
), ),
Texts( Texts(TranslationBase.of(context).verifyFingerprint,
TranslationBase.of(context).verifyFingerprint,
fontSize: SizeConfig.textMultiplier * 2, fontSize: SizeConfig.textMultiplier * 2,
) color: Colors.black)
], ],
), ),
))); )));
@ -752,10 +749,9 @@ class _ConfirmLogin extends State<ConfirmLogin> {
SizedBox( SizedBox(
height: 20, height: 20,
), ),
Texts( Texts(TranslationBase.of(context).verifyFaceID,
TranslationBase.of(context).verifyFaceID,
fontSize: SizeConfig.textMultiplier * 2, fontSize: SizeConfig.textMultiplier * 2,
) color: Colors.black)
], ],
), ),
))); )));
@ -791,11 +787,10 @@ class _ConfirmLogin extends State<ConfirmLogin> {
: SizedBox( : SizedBox(
height: 20, height: 20,
), ),
Texts( Texts(TranslationBase.of(context).moreVerification,
TranslationBase.of(context).moreVerification,
fontSize: SizeConfig.textMultiplier * 1.8, fontSize: SizeConfig.textMultiplier * 1.8,
textAlign: TextAlign.center, textAlign: TextAlign.center,
) color: Colors.black)
], ],
), ),
))); )));

@ -94,7 +94,7 @@ class _AdvancePaymentPageState extends State<AdvancePaymentPage> {
height: 65, height: 65,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(12), borderRadius: BorderRadius.circular(12),
color: Colors.white), color: Theme.of(context).primaryColor),
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
@ -125,7 +125,7 @@ class _AdvancePaymentPageState extends State<AdvancePaymentPage> {
height: 65, height: 65,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(12), borderRadius: BorderRadius.circular(12),
color: Colors.white), color: Theme.of(context).primaryColor),
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
@ -168,7 +168,7 @@ class _AdvancePaymentPageState extends State<AdvancePaymentPage> {
height: 65, height: 65,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(12), borderRadius: BorderRadius.circular(12),
color: Colors.white), color: Theme.of(context).primaryColor),
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
@ -189,7 +189,7 @@ class _AdvancePaymentPageState extends State<AdvancePaymentPage> {
height: 65, height: 65,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(12), borderRadius: BorderRadius.circular(12),
color: Colors.white), color: Theme.of(context).primaryColor),
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [

@ -13,12 +13,15 @@ import 'package:hexcolor/hexcolor.dart';
import 'advance_payment_page.dart'; import 'advance_payment_page.dart';
class MyBalancePage extends StatelessWidget { class MyBalancePage extends StatelessWidget {
List<ImagesInfo> imagesInfo = List(); List<ImagesInfo> imagesInfo = List();
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
imagesInfo.add(ImagesInfo(imageEn: 'https://hmgwebservices.com/Images/MobileApp/images-info-home/my-balance/en/0.png',imageAr: 'https://hmgwebservices.com/Images/MobileApp/images-info-home/my-balance/ar/0.png')); imagesInfo.add(ImagesInfo(
imageEn:
'https://hmgwebservices.com/Images/MobileApp/images-info-home/my-balance/en/0.png',
imageAr:
'https://hmgwebservices.com/Images/MobileApp/images-info-home/my-balance/ar/0.png'));
return BaseView<MyBalanceViewModel>( return BaseView<MyBalanceViewModel>(
onModelReady: (model) => model.getPatientAdvanceBalanceAmount(), onModelReady: (model) => model.getPatientAdvanceBalanceAmount(),
builder: (_, model, w) => AppScaffold( builder: (_, model, w) => AppScaffold(
@ -53,9 +56,9 @@ class MyBalancePage extends StatelessWidget {
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
Texts( Texts(
'${model.totalAdvanceBalanceAmount ?? 0} '+ TranslationBase.of(context).sar, '${model.totalAdvanceBalanceAmount ?? 0} ' +
TranslationBase.of(context).sar,
color: Colors.white, color: Colors.white,
bold: true, bold: true,
), ),
@ -76,16 +79,16 @@ class MyBalancePage extends StatelessWidget {
height: 65, height: 65,
margin: EdgeInsets.only(top: 8), margin: EdgeInsets.only(top: 8),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.white, color: Theme.of(context).primaryColor,
shape: BoxShape.rectangle, shape: BoxShape.rectangle,
borderRadius: BorderRadius.circular(7), borderRadius: BorderRadius.circular(7),
), ),
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
Texts( Texts(
'${model.patientAdvanceBalanceAmountList[index].patientAdvanceBalanceAmount} '+TranslationBase.of(context).sar, '${model.patientAdvanceBalanceAmountList[index].patientAdvanceBalanceAmount} ' +
TranslationBase.of(context).sar,
bold: true, bold: true,
), ),
Texts(model.patientAdvanceBalanceAmountList[index] Texts(model.patientAdvanceBalanceAmountList[index]
@ -94,7 +97,9 @@ class MyBalancePage extends StatelessWidget {
), ),
), ),
), ),
SizedBox(height: MediaQuery.of(context).size.height * 0.13 ,) SizedBox(
height: MediaQuery.of(context).size.height * 0.13,
)
], ],
), ),
), ),

@ -73,7 +73,8 @@ class NewTextFields extends StatefulWidget {
this.fontSize = 16.0, this.fontSize = 16.0,
this.fontWeight = FontWeight.w700, this.fontWeight = FontWeight.w700,
this.autoValidate = false, this.autoValidate = false,
this.hintColor,this.isEnabled=true}) this.hintColor,
this.isEnabled = true})
: super(key: key); : super(key: key);
final String hintText; final String hintText;
@ -142,7 +143,6 @@ class _NewTextFieldsState extends State<NewTextFields> {
super.dispose(); super.dispose();
} }
bool _determineReadOnly() { bool _determineReadOnly() {
if (widget.readOnly != null && widget.readOnly) { if (widget.readOnly != null && widget.readOnly) {
_focusNode.unfocus(); _focusNode.unfocus();
@ -156,12 +156,11 @@ class _NewTextFieldsState extends State<NewTextFields> {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return AnimatedContainer( return AnimatedContainer(
duration: Duration(milliseconds: 300), duration: Duration(milliseconds: 300),
decoration:BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(12), borderRadius: BorderRadius.circular(12),
color: Colors.white), color: Theme.of(context).primaryColor),
child: Container( child: Container(
margin: EdgeInsets.only(top: 8), margin: EdgeInsets.only(top: 8),
child: TextFormField( child: TextFormField(
enabled: widget.isEnabled, enabled: widget.isEnabled,
initialValue: widget.initialValue, initialValue: widget.initialValue,
@ -190,11 +189,8 @@ class _NewTextFieldsState extends State<NewTextFields> {
autofocus: widget.autoFocus ?? false, autofocus: widget.autoFocus ?? false,
validator: widget.validator, validator: widget.validator,
onSaved: widget.onSaved, onSaved: widget.onSaved,
style: Theme.of(context).textTheme.body2.copyWith(
style: Theme.of(context) fontSize: widget.fontSize, fontWeight: widget.fontWeight),
.textTheme
.body2
.copyWith(fontSize: widget.fontSize, fontWeight: widget.fontWeight),
inputFormatters: widget.keyboardType == TextInputType.phone inputFormatters: widget.keyboardType == TextInputType.phone
? <TextInputFormatter>[ ? <TextInputFormatter>[
WhitelistingTextInputFormatter.digitsOnly, WhitelistingTextInputFormatter.digitsOnly,
@ -203,32 +199,26 @@ class _NewTextFieldsState extends State<NewTextFields> {
: widget.inputFormatters, : widget.inputFormatters,
decoration: InputDecoration( decoration: InputDecoration(
labelText: widget.hintText, labelText: widget.hintText,
labelStyle: TextStyle(color: Colors.black), labelStyle:
TextStyle(color: Theme.of(context).textTheme.bodyText1.color),
errorBorder: OutlineInputBorder( errorBorder: OutlineInputBorder(
borderSide: BorderSide( borderSide: BorderSide(
color: Theme.of(context) color: Theme.of(context).errorColor.withOpacity(0.5),
.errorColor
.withOpacity(0.5),
width: 1.0), width: 1.0),
borderRadius: BorderRadius.circular(12.0)), borderRadius: BorderRadius.circular(12.0)),
focusedErrorBorder: OutlineInputBorder( focusedErrorBorder: OutlineInputBorder(
borderSide: BorderSide( borderSide: BorderSide(
color: Theme.of(context) color: Theme.of(context).errorColor.withOpacity(0.5),
.errorColor
.withOpacity(0.5),
width: 1.0), width: 1.0),
borderRadius: BorderRadius.circular(8.0)), borderRadius: BorderRadius.circular(8.0)),
focusedBorder: OutlineInputBorder( focusedBorder: OutlineInputBorder(
borderSide: borderSide: BorderSide(color: Colors.white, width: 1.0),
BorderSide(color: Colors.white, width: 1.0),
borderRadius: BorderRadius.circular(12)), borderRadius: BorderRadius.circular(12)),
disabledBorder: OutlineInputBorder( disabledBorder: OutlineInputBorder(
borderSide: borderSide: BorderSide(color: Colors.white, width: 1.0),
BorderSide(color: Colors.white, width: 1.0),
borderRadius: BorderRadius.circular(12)), borderRadius: BorderRadius.circular(12)),
enabledBorder: OutlineInputBorder( enabledBorder: OutlineInputBorder(
borderSide: borderSide: BorderSide(color: Colors.white, width: 1.0),
BorderSide(color: Colors.white, width: 1.0),
borderRadius: BorderRadius.circular(12), borderRadius: BorderRadius.circular(12),
), ),
), ),

@ -1,4 +1,5 @@
import 'package:diplomaticquarterapp/config/size_config.dart'; import 'package:diplomaticquarterapp/config/size_config.dart';
import 'package:diplomaticquarterapp/core/model/pharmacy/categorise_parent_model.dart';
import 'package:diplomaticquarterapp/core/viewModels/pharmacy_categorise_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/pharmacy_categorise_view_model.dart';
import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
import 'package:diplomaticquarterapp/pages/pharmacies/product_detail.dart'; import 'package:diplomaticquarterapp/pages/pharmacies/product_detail.dart';
@ -7,8 +8,10 @@ import 'package:diplomaticquarterapp/widgets/buttons/button.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_pharmacy_widget.dart';
import 'package:diplomaticquarterapp/widgets/others/entity_checkbox_list.dart';
import 'package:diplomaticquarterapp/widgets/others/network_base_view.dart'; import 'package:diplomaticquarterapp/widgets/others/network_base_view.dart';
import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart'; import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
@ -43,8 +46,13 @@ class _ParentCategorisePageState extends State<ParentCategorisePage> {
size: 29.0, size: 29.0,
); );
List<CategoriseParentModel> entityList = List();
List<CategoriseParentModel> entityListBrands = List();
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
TextEditingController minField = TextEditingController();
TextEditingController maxField = TextEditingController();
ProjectViewModel projectViewModel = Provider.of(context); ProjectViewModel projectViewModel = Provider.of(context);
return BaseView<PharmacyCategoriseViewModel>( return BaseView<PharmacyCategoriseViewModel>(
onModelReady: (model) => model.getCategoriseParent(i: id), onModelReady: (model) => model.getCategoriseParent(i: id),
@ -57,11 +65,8 @@ class _ParentCategorisePageState extends State<ParentCategorisePage> {
backgroundColor: Colors.white, backgroundColor: Colors.white,
isShowDecPage: false, isShowDecPage: false,
baseViewModel: model, baseViewModel: model,
body: Container( body: SingleChildScrollView(
child: ListView( child: Container(
scrollDirection: Axis.vertical,
children: [
Container(
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
@ -97,8 +102,7 @@ class _ParentCategorisePageState extends State<ParentCategorisePage> {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Row( Row(
mainAxisAlignment: mainAxisAlignment: MainAxisAlignment.spaceBetween,
MainAxisAlignment.spaceBetween,
children: [ children: [
Padding( Padding(
padding: EdgeInsets.all(10.0), padding: EdgeInsets.all(10.0),
@ -125,16 +129,14 @@ class _ParentCategorisePageState extends State<ParentCategorisePage> {
scrollDirection: scrollDirection:
Axis.vertical, Axis.vertical,
itemCount: model itemCount: model
.categoriseParent .categoriseParent.length,
.length,
itemBuilder: itemBuilder:
(BuildContext context, (BuildContext context,
int index) { int index) {
return Container( return Container(
child: Padding( child: Padding(
padding: padding:
EdgeInsets.all( EdgeInsets.all(4.0),
4.0),
child: InkWell( child: InkWell(
child: Column( child: Column(
crossAxisAlignment: crossAxisAlignment:
@ -146,8 +148,7 @@ class _ParentCategorisePageState extends State<ParentCategorisePage> {
index] index]
.name), .name),
Divider( Divider(
thickness: thickness: 0.6,
0.6,
color: Colors color: Colors
.black12, .black12,
) )
@ -167,8 +168,7 @@ class _ParentCategorisePageState extends State<ParentCategorisePage> {
.categoriseParent[ .categoriseParent[
index] index]
.id, .id,
parentId: parentId: id,
id,
)), )),
); );
}, },
@ -204,11 +204,10 @@ class _ParentCategorisePageState extends State<ParentCategorisePage> {
itemCount: model.categoriseParent.length > 8 itemCount: model.categoriseParent.length > 8
? 8 ? 8
: model.categoriseParent.length, : model.categoriseParent.length,
itemBuilder: itemBuilder: (BuildContext context, int index) {
(BuildContext context, int index) {
return Padding( return Padding(
padding: EdgeInsets.symmetric( padding:
horizontal: 8.0), EdgeInsets.symmetric(horizontal: 8.0),
child: InkWell( child: InkWell(
child: Column( child: Column(
crossAxisAlignment: crossAxisAlignment:
@ -222,8 +221,7 @@ class _ParentCategorisePageState extends State<ParentCategorisePage> {
width: 65.0, width: 65.0,
decoration: BoxDecoration( decoration: BoxDecoration(
shape: BoxShape.circle, shape: BoxShape.circle,
color: Colors color: Colors.orange.shade200
.orange.shade200
.withOpacity(0.45), .withOpacity(0.45),
), ),
child: Center( child: Center(
@ -247,12 +245,10 @@ class _ParentCategorisePageState extends State<ParentCategorisePage> {
child: Texts( child: Texts(
projectViewModel.isArabic projectViewModel.isArabic
? model ? model
.categoriseParent[ .categoriseParent[index]
index]
.namen .namen
: model : model
.categoriseParent[ .categoriseParent[index]
index]
.name, .name,
fontSize: 13.4, fontSize: 13.4,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
@ -268,8 +264,7 @@ class _ParentCategorisePageState extends State<ParentCategorisePage> {
FadePage( FadePage(
page: SubCategorisePage( page: SubCategorisePage(
title: model title: model
.categoriseParent[index] .categoriseParent[index].name,
.name,
id: model id: model
.categoriseParent[index].id, .categoriseParent[index].id,
parentId: id, parentId: id,
@ -318,11 +313,11 @@ class _ParentCategorisePageState extends State<ParentCategorisePage> {
maxChildSize: 0.95, maxChildSize: 0.95,
minChildSize: 0.9, minChildSize: 0.9,
builder: (BuildContext context, builder: (BuildContext context,
ScrollController ScrollController scrollController) {
scrollController) {
return SingleChildScrollView( return SingleChildScrollView(
controller: scrollController, controller: scrollController,
child: Container( child: Container(
color: Colors.white,
height: MediaQuery.of(context) height: MediaQuery.of(context)
.size .size
.height * .height *
@ -343,8 +338,7 @@ class _ParentCategorisePageState extends State<ParentCategorisePage> {
Texts( Texts(
'Refine', 'Refine',
fontWeight: fontWeight:
FontWeight FontWeight.w600,
.w600,
), ),
SizedBox( SizedBox(
width: 250.0, width: 250.0,
@ -352,11 +346,9 @@ class _ParentCategorisePageState extends State<ParentCategorisePage> {
InkWell( InkWell(
child: Texts( child: Texts(
'Close', 'Close',
color: color: Colors.red,
Colors.red,
fontWeight: fontWeight:
FontWeight FontWeight.w600,
.w600,
fontSize: 15.0, fontSize: 15.0,
), ),
onTap: () { onTap: () {
@ -374,100 +366,85 @@ class _ParentCategorisePageState extends State<ParentCategorisePage> {
Column( Column(
children: [ children: [
ExpansionTile( ExpansionTile(
title: Texts(
'Categorise'),
children: [
Container(
height: 350,
child: ListView
.builder(
controller:
scrollController,
scrollDirection:
Axis
.vertical,
shrinkWrap:
true,
itemCount: model
.categoriseParent
.length,
itemBuilder:
(BuildContext context,
int index) {
return CheckboxListTile(
tristate:
true,
title: title:
Texts(model.categoriseParent[index].name), Texts('Categorise'),
controlAffinity: children: [
ListTileControlAffinity.leading, ProcedureListWidget(
value: model: model,
checkedCategorise, masterList: model
onChanged: .categoriseParent,
(bool value) { removeHistory:
(item) {
setState(() { setState(() {
checkedCategorise = value; entityList
.remove(
item);
}); });
}, },
); addHistory:
}), (history) {
setState(() {
entityList.add(
history);
});
},
addSelectedHistories:
() {
//TODO build your fun herr
// widget.addSelectedHistories();
},
isEntityListSelected:
(master) =>
isEntityListSelected(
master),
) )
], ],
), ),
Divider( Divider(
thickness: 1.0, thickness: 1.0,
color: color: Colors.black12,
Colors.black12,
), ),
ExpansionTile( ExpansionTile(
title: title: Texts('Brands'),
Texts('Brands'),
children: [ children: [
Container( ProcedureListWidget(
height: 350, model: model,
child: ListView masterList: model
.builder( .brandsList,
scrollDirection: removeHistory:
Axis (item) {
.vertical,
shrinkWrap:
true,
itemCount: model
.brandsList
.length,
itemBuilder:
(BuildContext context,
int index) {
return CheckboxListTile(
tristate:
true,
title:
Texts(model.brandsList[index].name),
controlAffinity:
ListTileControlAffinity.leading,
value:
checkedBrands,
onChanged:
(bool value) {
setState(() { setState(() {
checkedBrands = value; entityListBrands
.remove(
item);
}); });
}, },
autofocus: addHistory:
true, (history) {
); setState(() {
}), entityListBrands
.add(
history);
});
},
addSelectedHistories:
() {
//TODO build your fun herr
// widget.addSelectedHistories();
},
isEntityListSelected:
(master) =>
isEntityListSelectedBrands(
master),
) )
], ],
), ),
Divider( Divider(
thickness: 1.0, thickness: 1.0,
color: color: Colors.black12,
Colors.black12,
), ),
ExpansionTile( ExpansionTile(
title: title: Texts('Price'),
Texts('Price'),
children: [ children: [
Container( Container(
color: Color( color: Color(
@ -485,8 +462,8 @@ class _ParentCategorisePageState extends State<ParentCategorisePage> {
Texts( Texts(
'Min'), 'Min'),
Container( Container(
color: color: Colors
Colors.white, .white,
width: width:
200, 200,
height: height:
@ -495,8 +472,11 @@ class _ParentCategorisePageState extends State<ParentCategorisePage> {
TextFormField( TextFormField(
decoration: decoration:
InputDecoration( InputDecoration(
border: OutlineInputBorder(), border:
OutlineInputBorder(),
), ),
controller:
minField,
), ),
), ),
], ],
@ -509,8 +489,8 @@ class _ParentCategorisePageState extends State<ParentCategorisePage> {
Texts( Texts(
'Max'), 'Max'),
Container( Container(
color: color: Colors
Colors.white, .white,
width: width:
200, 200,
height: height:
@ -519,8 +499,11 @@ class _ParentCategorisePageState extends State<ParentCategorisePage> {
TextFormField( TextFormField(
decoration: decoration:
InputDecoration( InputDecoration(
border: OutlineInputBorder(), border:
OutlineInputBorder(),
), ),
controller:
maxField,
), ),
), ),
], ],
@ -532,8 +515,7 @@ class _ParentCategorisePageState extends State<ParentCategorisePage> {
), ),
Divider( Divider(
thickness: 1.0, thickness: 1.0,
color: color: Colors.black12,
Colors.black12,
), ),
SizedBox( SizedBox(
height: MediaQuery.of( height: MediaQuery.of(
@ -544,8 +526,7 @@ class _ParentCategorisePageState extends State<ParentCategorisePage> {
), ),
Padding( Padding(
padding: padding:
EdgeInsets.all( EdgeInsets.all(8.0),
8.0),
child: Row( child: Row(
mainAxisAlignment: mainAxisAlignment:
MainAxisAlignment MainAxisAlignment
@ -554,11 +535,9 @@ class _ParentCategorisePageState extends State<ParentCategorisePage> {
Container( Container(
width: 100, width: 100,
child: Button( child: Button(
label: label: 'Reset',
'Reset',
backgroundColor: backgroundColor:
Colors Colors.red,
.red,
), ),
), ),
SizedBox( SizedBox(
@ -567,8 +546,51 @@ class _ParentCategorisePageState extends State<ParentCategorisePage> {
Container( Container(
width: 200, width: 200,
child: Button( child: Button(
label: onTap: () {
'Apply', String
categoriesId =
"";
for (CategoriseParentModel category
in entityList) {
if (categoriesId ==
"") {
categoriesId =
category
.id;
} else {
categoriesId =
"$categoriesId,${category.id}";
}
}
String
brandIds =
"";
for (CategoriseParentModel brand
in entityListBrands) {
if (brandIds ==
"") {
brandIds =
brand
.id;
} else {
brandIds =
"$brandIds,${brand.id}";
}
}
model.getFilteredProducts(
min: minField
.text
.toString(),
max: maxField
.text
.toString(),
categoryId:
categoriesId,
brandId:
brandIds);
},
label: 'Apply',
backgroundColor: backgroundColor:
Colors Colors
.green, .green,
@ -637,7 +659,9 @@ class _ParentCategorisePageState extends State<ParentCategorisePage> {
), ),
styleOne == true styleOne == true
? Container( ? Container(
height: SizeConfig.screenHeight * 7.8, height: model.parentProducts.length *
MediaQuery.of(context).size.height *
0.15,
child: GridView.builder( child: GridView.builder(
physics: NeverScrollableScrollPhysics(), physics: NeverScrollableScrollPhysics(),
gridDelegate: gridDelegate:
@ -648,8 +672,7 @@ class _ParentCategorisePageState extends State<ParentCategorisePage> {
childAspectRatio: 0.9, childAspectRatio: 0.9,
), ),
itemCount: model.parentProducts.length, itemCount: model.parentProducts.length,
itemBuilder: itemBuilder: (BuildContext context, int index) {
(BuildContext context, int index) {
return NetworkBaseView( return NetworkBaseView(
baseViewModel: model, baseViewModel: model,
child: InkWell( child: InkWell(
@ -684,10 +707,8 @@ class _ParentCategorisePageState extends State<ParentCategorisePage> {
), ),
child: Container( child: Container(
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: borderRadius: BorderRadius.only(
BorderRadius.only( topLeft: Radius.circular(110.0),
topLeft:
Radius.circular(110.0),
), ),
color: Colors.white, color: Colors.white,
), ),
@ -715,8 +736,7 @@ class _ParentCategorisePageState extends State<ParentCategorisePage> {
BoxDecoration(), BoxDecoration(),
child: Padding( child: Padding(
padding: padding:
EdgeInsets EdgeInsets.only(
.only(
right: 5.0, right: 5.0,
top: 20.0, top: 20.0,
bottom: 5.0, bottom: 5.0,
@ -724,10 +744,8 @@ class _ParentCategorisePageState extends State<ParentCategorisePage> {
child: Texts( child: Texts(
'offer' 'offer'
.toUpperCase(), .toUpperCase(),
color: Colors color: Colors.red,
.red, fontSize: 13.0,
fontSize:
13.0,
fontWeight: fontWeight:
FontWeight FontWeight
.w900, .w900,
@ -739,8 +757,8 @@ class _ParentCategorisePageState extends State<ParentCategorisePage> {
), ),
), ),
Container( Container(
margin: EdgeInsets margin:
.fromLTRB( EdgeInsets.fromLTRB(
0, 16, 0, 0), 0, 16, 0, 0),
alignment: alignment:
Alignment.center, Alignment.center,
@ -774,10 +792,9 @@ class _ParentCategorisePageState extends State<ParentCategorisePage> {
: 0, : 0,
padding: padding:
EdgeInsets.all(4), EdgeInsets.all(4),
decoration: decoration: BoxDecoration(
BoxDecoration( color:
color: Color( Color(0xffb23838),
0xffb23838),
borderRadius: borderRadius:
BorderRadius.only( BorderRadius.only(
topLeft: Radius topLeft: Radius
@ -805,8 +822,7 @@ class _ParentCategorisePageState extends State<ParentCategorisePage> {
], ],
), ),
Container( Container(
margin: margin: EdgeInsets.symmetric(
EdgeInsets.symmetric(
horizontal: 6, horizontal: 6,
vertical: 0, vertical: 0,
), ),
@ -821,8 +837,8 @@ class _ParentCategorisePageState extends State<ParentCategorisePage> {
.discountName != .discountName !=
null) null)
Container( Container(
width: double width:
.infinity, double.infinity,
height: 13.0, height: 13.0,
decoration: decoration:
BoxDecoration( BoxDecoration(
@ -836,10 +852,9 @@ class _ParentCategorisePageState extends State<ParentCategorisePage> {
index] index]
.discountName, .discountName,
regular: true, regular: true,
color: Colors color:
.white, Colors.white,
fontSize: fontSize: 10.4,
10.4,
), ),
), ),
), ),
@ -873,20 +888,21 @@ class _ParentCategorisePageState extends State<ParentCategorisePage> {
index] index]
.approvedRatingSum > .approvedRatingSum >
0 0
? (model.parentProducts[index].approvedRatingSum.toDouble() / ? (model.parentProducts[index].approvedRatingSum
model.parentProducts[index].approvedRatingSum .toDouble() /
model
.parentProducts[index]
.approvedRatingSum
.toDouble()) .toDouble())
.toDouble() .toDouble()
: 0, : 0,
forceStars: forceStars: true),
true),
Texts( Texts(
"(${model.parentProducts[index].approvedTotalReviews})", "(${model.parentProducts[index].approvedTotalReviews})",
regular: true, regular: true,
fontSize: 10, fontSize: 10,
fontWeight: fontWeight:
FontWeight FontWeight.w400,
.w400,
) )
], ],
), ),
@ -901,9 +917,8 @@ class _ParentCategorisePageState extends State<ParentCategorisePage> {
Navigator.push( Navigator.push(
context, context,
FadePage( FadePage(
page: ProductDetailPage( page: ProductDetailPage(model
model.parentProducts[ .parentProducts[index]),
index]),
)), )),
}, },
)); ));
@ -911,8 +926,9 @@ class _ParentCategorisePageState extends State<ParentCategorisePage> {
), ),
) )
: Container( : Container(
height: height: model.parentProducts.length *
MediaQuery.of(context).size.height * 5.0, MediaQuery.of(context).size.height *
0.122,
child: ListView.builder( child: ListView.builder(
physics: NeverScrollableScrollPhysics(), physics: NeverScrollableScrollPhysics(),
itemCount: model.parentProducts.length, itemCount: model.parentProducts.length,
@ -939,8 +955,8 @@ class _ParentCategorisePageState extends State<ParentCategorisePage> {
), ),
), ),
Container( Container(
margin: EdgeInsets margin:
.fromLTRB( EdgeInsets.fromLTRB(
0, 0, 0, 0), 0, 0, 0, 0),
alignment: alignment:
Alignment.center, Alignment.center,
@ -978,17 +994,15 @@ class _ParentCategorisePageState extends State<ParentCategorisePage> {
: 0, : 0,
padding: padding:
EdgeInsets.all(4), EdgeInsets.all(4),
decoration: decoration: BoxDecoration(
BoxDecoration( color:
color: Color( Color(0xffb23838),
0xffb23838),
borderRadius: borderRadius:
BorderRadius.only( BorderRadius.only(
topLeft: Radius topLeft: Radius
.circular( .circular(
6)), 6)),
), ),
child: Expanded(
child: Texts( child: Texts(
model model
.parentProducts[ .parentProducts[
@ -1000,14 +1014,11 @@ class _ParentCategorisePageState extends State<ParentCategorisePage> {
index] index]
.rxMessage .rxMessage
: "", : "",
color: color: Colors.white,
Colors.white,
regular: true, regular: true,
fontSize: 10, fontSize: 10,
fontWeight: fontWeight:
FontWeight FontWeight.w400,
.w400,
),
), ),
), ),
], ],
@ -1024,22 +1035,20 @@ class _ParentCategorisePageState extends State<ParentCategorisePage> {
MainAxisAlignment MainAxisAlignment
.spaceAround, .spaceAround,
crossAxisAlignment: crossAxisAlignment:
CrossAxisAlignment CrossAxisAlignment.start,
.start,
children: [ children: [
SizedBox( SizedBox(
height: 4.0, height: 4.0,
), ),
Container( Container(
width: MediaQuery.of( width:
context) MediaQuery.of(context)
.size .size
.width * .width *
0.65, 0.65,
child: Texts( child: Texts(
model model
.parentProducts[ .parentProducts[index]
index]
.name, .name,
regular: true, regular: true,
fontSize: 13.2, fontSize: 13.2,
@ -1053,10 +1062,8 @@ class _ParentCategorisePageState extends State<ParentCategorisePage> {
), ),
Padding( Padding(
padding: padding:
const EdgeInsets const EdgeInsets.only(
.only( top: 4, bottom: 4),
top: 4,
bottom: 4),
child: Texts( child: Texts(
"SAR ${model.parentProducts[index].price}", "SAR ${model.parentProducts[index].price}",
bold: true, bold: true,
@ -1071,10 +1078,14 @@ class _ParentCategorisePageState extends State<ParentCategorisePage> {
index] index]
.approvedRatingSum > .approvedRatingSum >
0 0
? (model.parentProducts[index].approvedRatingSum ? (model
.parentProducts[
index]
.approvedRatingSum
.toDouble() / .toDouble() /
model model
.parentProducts[index] .parentProducts[
index]
.approvedRatingSum .approvedRatingSum
.toDouble()) .toDouble())
.toDouble() .toDouble()
@ -1099,8 +1110,8 @@ class _ParentCategorisePageState extends State<ParentCategorisePage> {
Navigator.push( Navigator.push(
context, context,
FadePage( FadePage(
page: ProductDetailPage(model page: ProductDetailPage(
.parentProducts[index]), model.parentProducts[index]),
)), )),
}, },
); );
@ -1109,9 +1120,25 @@ class _ParentCategorisePageState extends State<ParentCategorisePage> {
], ],
), ),
), ),
],
),
), ),
)); ));
} }
bool isEntityListSelected(CategoriseParentModel masterKey) {
Iterable<CategoriseParentModel> history =
entityList.where((element) => masterKey.id == element.id);
if (history.length > 0) {
return true;
}
return false;
}
bool isEntityListSelectedBrands(CategoriseParentModel masterKey) {
Iterable<CategoriseParentModel> history =
entityListBrands.where((element) => masterKey.id == element.id);
if (history.length > 0) {
return true;
}
return false;
}
} }

@ -104,7 +104,17 @@ class _PharmacyCategorisePageState extends State<PharmacyCategorisePage> {
child: Padding( child: Padding(
padding: EdgeInsets.all(4.0), padding: EdgeInsets.all(4.0),
child: InkWell( child: InkWell(
onTap: () {}, onTap: () {
Navigator.push(
context,
FadePage(
page: FinalProductsPage(
id: "",
productType: 4,
),
),
);
},
child: Container( child: Container(
height: 50.0, height: 50.0,
width: 55.0, width: 55.0,
@ -181,7 +191,15 @@ class _PharmacyCategorisePageState extends State<PharmacyCategorisePage> {
padding: EdgeInsets.all(4.0), padding: EdgeInsets.all(4.0),
child: InkWell( child: InkWell(
onTap: () { onTap: () {
// _scanQrAndGetPatient(context, model); Navigator.push(
context,
FadePage(
page: FinalProductsPage(
id: "",
productType: 3,
),
),
);
}, },
child: Container( child: Container(
height: 50.0, height: 50.0,

@ -1,9 +1,11 @@
import 'package:diplomaticquarterapp/core/model/pharmacy/categorise_parent_model.dart';
import 'package:diplomaticquarterapp/core/viewModels/pharmacy_categorise_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/pharmacy_categorise_view_model.dart';
import 'package:diplomaticquarterapp/pages/pharmacies/product_detail.dart'; import 'package:diplomaticquarterapp/pages/pharmacies/product_detail.dart';
import 'package:diplomaticquarterapp/widgets/buttons/button.dart'; import 'package:diplomaticquarterapp/widgets/buttons/button.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_pharmacy_widget.dart';
import 'package:diplomaticquarterapp/widgets/others/entity_checkbox_list.dart';
import 'package:diplomaticquarterapp/widgets/others/network_base_view.dart'; import 'package:diplomaticquarterapp/widgets/others/network_base_view.dart';
import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart'; import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@ -40,9 +42,12 @@ class _SubCategorisePageState extends State<SubCategorisePage> {
color: Colors.blue, color: Colors.blue,
size: 29.0, size: 29.0,
); );
List<CategoriseParentModel> entityList = List();
List<CategoriseParentModel> entityListBrands = List();
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
TextEditingController minField = TextEditingController();
TextEditingController maxField = TextEditingController();
return BaseView<PharmacyCategoriseViewModel>( return BaseView<PharmacyCategoriseViewModel>(
onModelReady: (model) => model.getSubCategorise(i: id), onModelReady: (model) => model.getSubCategorise(i: id),
builder: (BuildContext context, PharmacyCategoriseViewModel model, builder: (BuildContext context, PharmacyCategoriseViewModel model,
@ -56,7 +61,6 @@ class _SubCategorisePageState extends State<SubCategorisePage> {
baseViewModel: model, baseViewModel: model,
body: SingleChildScrollView( body: SingleChildScrollView(
child: Container( child: Container(
height: MediaQuery.of(context).size.height * 5.97,
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
@ -282,6 +286,7 @@ class _SubCategorisePageState extends State<SubCategorisePage> {
return SingleChildScrollView( return SingleChildScrollView(
controller: scrollController, controller: scrollController,
child: Container( child: Container(
color: Colors.white,
height: MediaQuery.of(context) height: MediaQuery.of(context)
.size .size
.height * .height *
@ -333,45 +338,34 @@ class _SubCategorisePageState extends State<SubCategorisePage> {
title: title:
Texts('Categorise'), Texts('Categorise'),
children: [ children: [
Container( ProcedureListWidget(
height: 350, model: model,
child: ListView masterList: model
.builder( .subCategorise,
controller: removeHistory:
scrollController, (item) {
scrollDirection: setState(() {
Axis entityList
.vertical, .remove(
shrinkWrap: item);
true,
itemCount: model
.categoriseParent
.length,
itemBuilder:
(BuildContext
context,
int index) {
return CheckboxListTile(
tristate:
true,
title: Texts(model
.categoriseParent[index]
.name),
controlAffinity:
ListTileControlAffinity.leading,
value:
checkedCategorise,
onChanged:
(bool
value) {
setState(
() {
checkedCategorise =
value;
}); });
}, },
); addHistory:
}), (history) {
setState(() {
entityList.add(
history);
});
},
addSelectedHistories:
() {
//TODO build your fun herr
// widget.addSelectedHistories();
},
isEntityListSelected:
(master) =>
isEntityListSelected(
master),
) )
], ],
), ),
@ -382,45 +376,35 @@ class _SubCategorisePageState extends State<SubCategorisePage> {
ExpansionTile( ExpansionTile(
title: Texts('Brands'), title: Texts('Brands'),
children: [ children: [
Container( ProcedureListWidget(
height: 350, model: model,
child: ListView masterList: model
.builder( .brandsList,
scrollDirection: removeHistory:
Axis (item) {
.vertical, setState(() {
shrinkWrap: entityListBrands
true, .remove(
itemCount: model item);
.brandsList
.length,
itemBuilder:
(BuildContext
context,
int index) {
return CheckboxListTile(
tristate:
true,
title: Texts(model
.brandsList[index]
.name),
controlAffinity:
ListTileControlAffinity.leading,
value:
checkedBrands,
onChanged:
(bool
value) {
setState(
() {
checkedBrands =
value;
}); });
}, },
autofocus: addHistory:
true, (history) {
); setState(() {
}), entityListBrands
.add(
history);
});
},
addSelectedHistories:
() {
//TODO build your fun herr
// widget.addSelectedHistories();
},
isEntityListSelected:
(master) =>
isEntityListSelectedBrands(
master),
) )
], ],
), ),
@ -460,6 +444,8 @@ class _SubCategorisePageState extends State<SubCategorisePage> {
border: border:
OutlineInputBorder(), OutlineInputBorder(),
), ),
controller:
minField,
), ),
), ),
], ],
@ -485,6 +471,8 @@ class _SubCategorisePageState extends State<SubCategorisePage> {
border: border:
OutlineInputBorder(), OutlineInputBorder(),
), ),
controller:
maxField,
), ),
), ),
], ],
@ -527,6 +515,50 @@ class _SubCategorisePageState extends State<SubCategorisePage> {
Container( Container(
width: 200, width: 200,
child: Button( child: Button(
onTap: () {
String
categoriesId =
"";
for (CategoriseParentModel category
in entityList) {
if (categoriesId ==
"") {
categoriesId =
category
.id;
} else {
categoriesId =
"$categoriesId,${category.id}";
}
}
String
brandIds =
"";
for (CategoriseParentModel brand
in entityListBrands) {
if (brandIds ==
"") {
brandIds =
brand
.id;
} else {
brandIds =
"$brandIds,${brand.id}";
}
}
model.getFilteredProducts(
min: minField
.text
.toString(),
max: maxField
.text
.toString(),
categoryId:
categoriesId,
brandId:
brandIds);
},
label: 'Apply', label: 'Apply',
backgroundColor: backgroundColor:
Colors Colors
@ -596,7 +628,9 @@ class _SubCategorisePageState extends State<SubCategorisePage> {
), ),
styleOne == true styleOne == true
? Container( ? Container(
height: MediaQuery.of(context).size.height * 3.85, height: model.subProducts.length *
MediaQuery.of(context).size.height *
0.15,
child: GridView.builder( child: GridView.builder(
physics: NeverScrollableScrollPhysics(), physics: NeverScrollableScrollPhysics(),
gridDelegate: gridDelegate:
@ -604,7 +638,7 @@ class _SubCategorisePageState extends State<SubCategorisePage> {
crossAxisCount: 2, crossAxisCount: 2,
crossAxisSpacing: 0.5, crossAxisSpacing: 0.5,
mainAxisSpacing: 2.0, mainAxisSpacing: 2.0,
childAspectRatio: 1.0, childAspectRatio: 0.9,
), ),
itemCount: model.subProducts.length, itemCount: model.subProducts.length,
itemBuilder: (BuildContext context, int index) { itemBuilder: (BuildContext context, int index) {
@ -798,7 +832,9 @@ class _SubCategorisePageState extends State<SubCategorisePage> {
), ),
) )
: Container( : Container(
height: MediaQuery.of(context).size.height * 5.0, height: model.subProducts.length *
MediaQuery.of(context).size.height *
0.122,
child: ListView.builder( child: ListView.builder(
physics: NeverScrollableScrollPhysics(), physics: NeverScrollableScrollPhysics(),
itemCount: model.subProducts.length, itemCount: model.subProducts.length,
@ -991,4 +1027,22 @@ class _SubCategorisePageState extends State<SubCategorisePage> {
), ),
)); ));
} }
bool isEntityListSelected(CategoriseParentModel masterKey) {
Iterable<CategoriseParentModel> history =
entityList.where((element) => masterKey.id == element.id);
if (history.length > 0) {
return true;
}
return false;
}
bool isEntityListSelectedBrands(CategoriseParentModel masterKey) {
Iterable<CategoriseParentModel> history =
entityListBrands.where((element) => masterKey.id == element.id);
if (history.length > 0) {
return true;
}
return false;
}
} }

@ -36,6 +36,7 @@ defaultTheme({fontName}) {
highlightColor: Colors.grey[100].withOpacity(0.4), highlightColor: Colors.grey[100].withOpacity(0.4),
splashColor: Colors.transparent, splashColor: Colors.transparent,
primaryColor: Color(0xffffffff), primaryColor: Color(0xffffffff),
buttonColor: Colors.black,
toggleableActiveColor: secondaryColor, toggleableActiveColor: secondaryColor,
indicatorColor: secondaryColor, indicatorColor: secondaryColor,
bottomSheetTheme: bottomSheetTheme:
@ -86,6 +87,7 @@ invertThemes({fontName}) {
highlightColor: Colors.grey[100].withOpacity(0.4), highlightColor: Colors.grey[100].withOpacity(0.4),
splashColor: Colors.transparent, splashColor: Colors.transparent,
primaryColor: Color(0xff515A5D), primaryColor: Color(0xff515A5D),
buttonColor: Colors.black,
toggleableActiveColor: secondaryColor, toggleableActiveColor: secondaryColor,
indicatorColor: secondaryColor, indicatorColor: secondaryColor,
bottomSheetTheme: bottomSheetTheme:

@ -1571,6 +1571,13 @@ class TranslationBase {
localizedValues["shipping-address"][locale.languageCode]; localizedValues["shipping-address"][locale.languageCode];
String get covidAlert => localizedValues["covid-alert"][locale.languageCode]; String get covidAlert => localizedValues["covid-alert"][locale.languageCode];
String get pharmacyRelogin => localizedValues["pharmacy-relogin"][locale.languageCode]; String get pharmacyRelogin => localizedValues["pharmacy-relogin"][locale.languageCode];
String get onlineCheckInAgreement => localizedValues["onlineCheckInAgreement"][locale.languageCode];
String get chiefComplaints => localizedValues["chiefComplaints"][locale.languageCode];
String get errorChiefComplaints => localizedValues["errorChiefComplaints"][locale.languageCode];
String get expectedArrivalTime => localizedValues["expectedArrivalTime"][locale.languageCode];
String get errorExpectedArrivalTime => localizedValues["errorExpectedArrivalTimes"][locale.languageCode];
String get anicllaryOrders =>
localizedValues["ancillary-orders"][locale.languageCode];
} }
class TranslationBaseDelegate extends LocalizationsDelegate<TranslationBase> { class TranslationBaseDelegate extends LocalizationsDelegate<TranslationBase> {

@ -18,7 +18,8 @@ class BottomNavigationItem extends StatelessWidget {
final int currentIndex; final int currentIndex;
final String name; final String name;
AuthenticatedUserObject authenticatedUserObject = locator<AuthenticatedUserObject>(); AuthenticatedUserObject authenticatedUserObject =
locator<AuthenticatedUserObject>();
BottomNavigationItem( BottomNavigationItem(
{this.icon, {this.icon,
@ -52,7 +53,7 @@ class BottomNavigationItem extends StatelessWidget {
child: Icon(currentIndex == index ? activeIcon : icon, child: Icon(currentIndex == index ? activeIcon : icon,
color: currentIndex == index color: currentIndex == index
? secondaryColor ? secondaryColor
: Theme.of(context).dividerColor, : Colors.grey,
size: 22.0), size: 22.0),
), ),
SizedBox( SizedBox(

@ -22,7 +22,7 @@ class SecondaryButton extends StatefulWidget {
this.label = "", this.label = "",
this.icon, this.icon,
this.iconOnly = false, this.iconOnly = false,
this.color , this.color,
this.textColor = Colors.white, this.textColor = Colors.white,
this.onTap, this.onTap,
this.loading: false, this.loading: false,
@ -144,7 +144,9 @@ class _SecondaryButtonState extends State<SecondaryButton>
onTapCancel: () { onTapCancel: () {
_animationController.forward(); _animationController.forward();
}, },
onTap: () =>{ widget.disabled ? null : widget.onTap(), }, onTap: () => {
widget.disabled ? null : widget.onTap(),
},
// onTap: widget.disabled?null:Feedback.wrapForTap(widget.onTap, context), // onTap: widget.disabled?null:Feedback.wrapForTap(widget.onTap, context),
behavior: HitTestBehavior.opaque, behavior: HitTestBehavior.opaque,
child: Transform.scale( child: Transform.scale(
@ -177,8 +179,9 @@ class _SecondaryButtonState extends State<SecondaryButton>
width: MediaQuery.of(context).size.width, width: MediaQuery.of(context).size.width,
height: 100, height: 100,
decoration: BoxDecoration( decoration: BoxDecoration(
color: widget.disabled? Colors.grey: widget.color ?? Theme.of(context).primaryColor, color: widget.disabled
), ? Colors.grey
: widget.color ?? Theme.of(context).buttonColor),
), ),
), ),
Positioned( Positioned(
@ -191,7 +194,9 @@ class _SecondaryButtonState extends State<SecondaryButton>
height: MediaQuery.of(context).size.width * 2.2, height: MediaQuery.of(context).size.width * 2.2,
decoration: BoxDecoration( decoration: BoxDecoration(
shape: BoxShape.circle, shape: BoxShape.circle,
color: widget.disabled? Colors.grey: widget.color ?? Theme.of(context).primaryColor, color: widget.disabled
? Colors.grey
: widget.color ?? Theme.of(context).buttonColor,
), ),
), ),
), ),
@ -238,7 +243,9 @@ class _SecondaryButtonState extends State<SecondaryButton>
color: widget.textColor, color: widget.textColor,
fontSize: widget.small ? 12.0 : 15.0, fontSize: widget.small ? 12.0 : 15.0,
// fontWeight: FontWeight.w800, // fontWeight: FontWeight.w800,
fontFamily: projectViewModel.isArabic ? 'Cairo' : 'WorkSans'), fontFamily: projectViewModel.isArabic
? 'Cairo'
: 'WorkSans'),
), ),
) )
], ],

@ -15,7 +15,7 @@ class ServicesContainer extends StatelessWidget {
height: 60, height: 60,
margin: EdgeInsets.all(8), margin: EdgeInsets.all(8),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.white, color: Theme.of(context).primaryColor,
shape: BoxShape.rectangle, shape: BoxShape.rectangle,
borderRadius: BorderRadius.circular(7), borderRadius: BorderRadius.circular(7),
), ),

@ -203,7 +203,10 @@ class _TextsState extends State<Texts> {
Stack( Stack(
children: <Widget>[ children: <Widget>[
Text( Text(
!hidden ? text : (text.substring(0, !hidden
? text
: (text.substring(
0,
text.length > widget.maxLength text.length > widget.maxLength
? widget.maxLength ? widget.maxLength
: text.length)), : text.length)),
@ -217,13 +220,16 @@ class _TextsState extends State<Texts> {
style: widget.style != null style: widget.style != null
? _getFontStyle().copyWith( ? _getFontStyle().copyWith(
fontStyle: widget.italic ? FontStyle.italic : null, fontStyle: widget.italic ? FontStyle.italic : null,
color: widget.color != null ? widget.color : null, color: widget.color != null
? widget.color
: Theme.of(context).textTheme.bodyText1.color,
fontWeight: widget.fontWeight ?? _getFontWeight(), fontWeight: widget.fontWeight ?? _getFontWeight(),
) )
: TextStyle( : TextStyle(
decoration: widget.decoration, decoration: widget.decoration,
fontStyle: widget.italic ? FontStyle.italic : null, fontStyle: widget.italic ? FontStyle.italic : null,
color: widget.color ?? Colors.black, color: widget.color ??
Theme.of(context).textTheme.bodyText1.color,
fontSize: widget.fontSize ?? _getFontSize(), fontSize: widget.fontSize ?? _getFontSize(),
letterSpacing: widget.variant == "overline" ? 1 : null, letterSpacing: widget.variant == "overline" ? 1 : null,
fontWeight: widget.fontWeight ?? _getFontWeight(), fontWeight: widget.fontWeight ?? _getFontWeight(),

@ -93,7 +93,7 @@ class PharmacyAppScaffold extends StatelessWidget {
) )
: buildBodyWidget(), : buildBodyWidget(),
bottomSheet: bottomSheet, bottomSheet: bottomSheet,
floatingActionButton: floatingActionButton ?? floatingActionButton, // floatingActionButton: floatingActionButton ?? floatingActionButton,
// bottomNavigationBar: // bottomNavigationBar:
// this.isBottomBar == true ? BottomBarSearch() : SizedBox() // this.isBottomBar == true ? BottomBarSearch() : SizedBox()
// floatingActionButton: FloatingSearchButton(), // floatingActionButton: FloatingSearchButton(),
@ -105,7 +105,7 @@ class PharmacyAppScaffold extends StatelessWidget {
} }
buildBodyWidget() { buildBodyWidget() {
// return body; //Stack(children: <Widget>[body, buildAppLoaderWidget(isLoading)]); return body; //Stack(children: <Widget>[body, buildAppLoaderWidget(isLoading)]);
return Stack(children: <Widget>[body, FloatingSearchButton()]); //return Stack(children: <Widget>[body, FloatingSearchButton()]);
} }
} }

@ -0,0 +1,170 @@
import 'package:diplomaticquarterapp/core/model/pharmacy/categorise_parent_model.dart';
import 'package:diplomaticquarterapp/core/viewModels/pharmacy_categorise_view_model.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
import 'package:diplomaticquarterapp/widgets/input/text_field.dart';
import 'package:diplomaticquarterapp/widgets/others/network_base_view.dart';
import 'package:diplomaticquarterapp/widgets/text/app_texts_widget.dart';
import 'package:eva_icons_flutter/eva_icons_flutter.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
class ProcedureListWidget extends StatefulWidget {
final PharmacyCategoriseViewModel model;
final Function addSelectedHistories;
final Function(CategoriseParentModel) removeHistory;
final Function(CategoriseParentModel) addHistory;
final Function(CategoriseParentModel) addRemarks;
final bool Function(CategoriseParentModel) isEntityListSelected;
final List<CategoriseParentModel> masterList;
ProcedureListWidget(
{Key key,
this.model,
this.addSelectedHistories,
this.removeHistory,
this.masterList,
this.addHistory,
this.isEntityListSelected,
this.addRemarks})
: super(key: key);
@override
_ProcedureListWidgetState createState() => _ProcedureListWidgetState();
}
class _ProcedureListWidgetState extends State<ProcedureListWidget> {
int selectedType = 0;
int typeUrgent;
int typeRegular;
setSelectedType(int val) {
setState(() {
selectedType = val;
});
}
List<CategoriseParentModel> items = List();
List<String> remarksList = List();
List<int> typeList = List();
@override
void initState() {
items.addAll(widget.masterList);
super.initState();
}
TextEditingController remarksController = TextEditingController();
@override
Widget build(BuildContext context) {
return Container(
child: Column(
children: [
NetworkBaseView(
baseViewModel: widget.model,
child: Container(
height: MediaQuery.of(context).size.height * 0.35,
child: Center(
child: Container(
margin: EdgeInsets.only(top: 15),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(12),
color: Colors.white),
child: ListView(
children: [
// TextFields(
// hintText:
// 'sss', //TranslationBase.of(context).searchProcedures,
// suffixIcon: EvaIcons.search,
// onChanged: (value) {
// filterSearchResults(value);
// },
// ),
SizedBox(
height: 15,
),
items.length != 0
? Column(
children: items.map((historyInfo) {
return Column(
children: [
Row(
children: [
Checkbox(
value: widget.isEntityListSelected(
historyInfo),
activeColor: Colors.red[800],
onChanged: (bool newValue) {
setState(() {
if (widget.isEntityListSelected(
historyInfo)) {
widget
.removeHistory(historyInfo);
} else {
widget.addHistory(historyInfo);
}
});
}),
Expanded(
child: Padding(
padding: const EdgeInsets.symmetric(
horizontal: 10, vertical: 0),
child: Texts(historyInfo.name,
variant: "bodyText",
bold: true,
color: Colors.black),
),
),
],
),
Divider(
height: 1,
),
],
);
}).toList(),
)
: Center(
child: Container(
child: AppText(
"There's no procedures for this category",
color: Color(0xFFB9382C)),
),
)
],
),
)),
),
),
SizedBox(
height: 10,
),
],
),
);
}
void filterSearchResults(String query) {
List<CategoriseParentModel> dummySearchList = List();
dummySearchList.addAll(widget.masterList);
if (query.isNotEmpty) {
List<CategoriseParentModel> dummyListData = List();
dummySearchList.forEach((item) {
if (item.name.toLowerCase().contains(query.toLowerCase())) {
dummyListData.add(item);
}
});
setState(() {
items.clear();
items.addAll(dummyListData);
});
return;
} else {
setState(() {
items.clear();
items.addAll(widget.masterList);
});
}
}
}

@ -1,3 +1,4 @@
import 'package:diplomaticquarterapp/Constants.dart';
import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@ -48,9 +49,8 @@ class BottomNavPharmacyItem extends StatelessWidget {
), ),
Container( Container(
child: Icon(currentIndex == index ? activeIcon : icon, child: Icon(currentIndex == index ? activeIcon : icon,
color: currentIndex == index color:
? Theme.of(context).primaryColor currentIndex == index ? secondaryColor : Colors.grey,
: Theme.of(context).primaryColor,
size: 22.0), size: 22.0),
), ),
SizedBox( SizedBox(
@ -61,9 +61,7 @@ class BottomNavPharmacyItem extends StatelessWidget {
Texts( Texts(
title, title,
textAlign: TextAlign.center, textAlign: TextAlign.center,
color: currentIndex == index color: currentIndex == index ? secondaryColor : Colors.grey,
? Theme.of(context).primaryColor
: Theme.of(context).primaryColor,
fontSize: 11, fontSize: 11,
), ),
], ],

Loading…
Cancel
Save