dev_v3.13.6_voipcall
Sultan khan 2 years ago
parent cbc38940ea
commit ec13edc28b

@ -1,24 +1,24 @@
class AppoitmentAllHistoryResultList { class AppoitmentAllHistoryResultList {
String? setupID; String? setupID;
int? projectID; dynamic? projectID;
int? appointmentNo; dynamic? appointmentNo;
String? appointmentDate; String? appointmentDate;
dynamic appointmentDateN; dynamic? appointmentDateN;
int? appointmentType; dynamic? appointmentType;
String? bookDate; String? bookDate;
int? patientType; dynamic? patientType;
int? patientID; dynamic? patientID;
int? clinicID; dynamic? clinicID;
int? doctorID; dynamic? doctorID;
String? endDate; String? endDate;
String? startTime; String? startTime;
String? endTime; String? endTime;
int? status; dynamic? status;
int? visitType; dynamic? visitType;
int? visitFor; dynamic? visitFor;
int? patientStatusType; dynamic? patientStatusType;
int? companyID; dynamic? companyID;
int? bookedBy; dynamic? bookedBy;
String? bookedOn; String? bookedOn;
dynamic confirmedBy; dynamic confirmedBy;
dynamic confirmedOn; dynamic confirmedOn;
@ -32,24 +32,24 @@ class AppoitmentAllHistoryResultList {
dynamic statusDescN; dynamic statusDescN;
bool? vitalStatus; bool? vitalStatus;
dynamic vitalSignAppointmentNo; dynamic vitalSignAppointmentNo;
int? episodeID; dynamic? episodeID;
int? actualDoctorRate; dynamic? actualDoctorRate;
String? clinicName; String? clinicName;
bool? complainExists; bool? complainExists;
String? doctorImageURL; String? doctorImageURL;
String? doctorNameObj; String? doctorNameObj;
int? doctorRate; dynamic? doctorRate;
dynamic decimalDoctorRate; dynamic decimalDoctorRate;
List<String>? doctorSpeciality; List<String>? doctorSpeciality;
String? doctorTitle; String? doctorTitle;
int? gender; dynamic? gender;
String? genderDescription; String? genderDescription;
bool? iSAllowOnlineCheckedIN; bool? iSAllowOnlineCheckedIN;
bool? isActiveDoctor; bool? isActiveDoctor;
bool? isActiveDoctorProfile; bool? isActiveDoctorProfile;
bool? isDoctorAllowVedioCall; bool? isDoctorAllowVedioCall;
bool? isExecludeDoctor; bool? isExecludeDoctor;
int? isFollowup; dynamic? isFollowup;
bool? isLiveCareAppointment; bool? isLiveCareAppointment;
bool? isInOutPatient; bool? isInOutPatient;
bool? isMedicalReportRequested; bool? isMedicalReportRequested;
@ -58,15 +58,15 @@ class AppoitmentAllHistoryResultList {
dynamic listHISGetContactLensPerscription; dynamic listHISGetContactLensPerscription;
dynamic listHISGetGlassPerscription; dynamic listHISGetGlassPerscription;
String? longitude; String? longitude;
int? nextAction; dynamic? nextAction;
int? noOfPatientsRate; dynamic? noOfPatientsRate;
int? originalClinicID; dynamic? originalClinicID;
int? originalProjectID; dynamic? originalProjectID;
String? projectName; String? projectName;
String? qR; String? qR;
int? remaniningHoursTocanPay; int? remaniningHoursTocanPay;
bool? sMSButtonVisable; bool? sMSButtonVisable;
int? serviceID; dynamic? serviceID;
AppoitmentAllHistoryResultList( AppoitmentAllHistoryResultList(
{this.setupID, {this.setupID,

@ -1,5 +1,5 @@
class YearlyHeartRateResModel { class YearlyHeartRateResModel {
num? valueAvg; dynamic? valueAvg;
int? medCategoryID; int? medCategoryID;
int? month; int? month;
String? monthName; String? monthName;

@ -356,7 +356,7 @@ 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/HMG", //"https://twitter.com/hashtag/مجموعة_د_سليمان_الحبيب_الطبية?src=hashtag_click&f=live", //this url is not working so changed to the hmg
))); )));
}, },
imageLocation: 'assets/images/new-design/twitter_dashboard_icon.png', imageLocation: 'assets/images/new-design/twitter_dashboard_icon.png',

@ -138,7 +138,7 @@ class _BmrCalculatorState extends State<BmrCalculator> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
if (dropdownValue == null) dropdownValue = TranslationBase.of(context).lightActive1; dropdownValue = TranslationBase.of(context).lightActive1;
ProjectViewModel projectViewModel = Provider.of(context); ProjectViewModel projectViewModel = Provider.of(context);
_weightPopupList = <PopupMenuItem>[PopupMenuItem(child: Text(TranslationBase.of(context).kg), value: true), PopupMenuItem(child: Text(TranslationBase.of(context).lb), value: false)]; _weightPopupList = <PopupMenuItem>[PopupMenuItem(child: Text(TranslationBase.of(context).kg), value: true), PopupMenuItem(child: Text(TranslationBase.of(context).lb), value: false)];
_heightPopupList = <PopupMenuItem>[PopupMenuItem(child: Text(TranslationBase.of(context).cm), value: true), PopupMenuItem(child: Text(TranslationBase.of(context).ft), value: false)]; _heightPopupList = <PopupMenuItem>[PopupMenuItem(child: Text(TranslationBase.of(context).cm), value: true), PopupMenuItem(child: Text(TranslationBase.of(context).ft), value: false)];

@ -44,8 +44,14 @@ class _CalorieCalculatorState extends State<CalorieCalculator> {
// int height = 0; // int height = 0;
// int weight = 0; // int weight = 0;
double? calories; double? calories;
String dropdownValue = ''; String? dropdownValue = '';
@override
void initState() {
super.initState();
}
void updateColor(int type) { void updateColor(int type) {
//MG/DLT card //MG/DLT card
if (type == 1) { if (type == 1) {
@ -74,12 +80,14 @@ class _CalorieCalculatorState extends State<CalorieCalculator> {
} }
} }
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
ProjectViewModel projectViewModel = Provider.of(context); ProjectViewModel projectViewModel = Provider.of(context);
_weightPopupList = <PopupMenuItem>[PopupMenuItem(child: Text(TranslationBase.of(context).kg), value: true), PopupMenuItem(child: Text(TranslationBase.of(context).lb), value: false)]; _weightPopupList = <PopupMenuItem>[PopupMenuItem(child: Text(TranslationBase.of(context).kg), value: true), PopupMenuItem(child: Text(TranslationBase.of(context).lb), value: false)];
_heightPopupList = <PopupMenuItem>[PopupMenuItem(child: Text(TranslationBase.of(context).cm), value: true), PopupMenuItem(child: Text(TranslationBase.of(context).ft), value: false)]; _heightPopupList = <PopupMenuItem>[PopupMenuItem(child: Text(TranslationBase.of(context).cm), value: true), PopupMenuItem(child: Text(TranslationBase.of(context).ft), value: false)];
dropdownValue= TranslationBase.of(context).almostInactive;
return AppScaffold( return AppScaffold(
isShowAppBar: true, isShowAppBar: true,
isShowDecPage: false, isShowDecPage: false,
@ -288,7 +296,7 @@ class _CalorieCalculatorState extends State<CalorieCalculator> {
height: 18, height: 18,
child: DropdownButtonHideUnderline( child: DropdownButtonHideUnderline(
child: DropdownButton<String>( child: DropdownButton<String>(
value: dropdownValue, value:dropdownValue,
key: clinicDropdownKey, key: clinicDropdownKey,
icon: Icon(Icons.arrow_downward), icon: Icon(Icons.arrow_downward),
iconSize: 0, iconSize: 0,

@ -83,6 +83,8 @@ class _CarbsState extends State<Carbs> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
ProjectViewModel projectViewModel = Provider.of(context); ProjectViewModel projectViewModel = Provider.of(context);
dropdownValue = TranslationBase.of(context).dietVeryLow;
return AppScaffold( return AppScaffold(
isShowAppBar: true, isShowAppBar: true,
isShowDecPage: false, isShowDecPage: false,

@ -85,7 +85,7 @@ class _IdealBodyState extends State<IdealBody> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
if (dropdownValue == null) dropdownValue = TranslationBase.of(context).mediumFinger; dropdownValue = TranslationBase.of(context).mediumFinger;
_weightPopupList = <PopupMenuItem>[PopupMenuItem(child: Text(TranslationBase.of(context).kg), value: true), PopupMenuItem(child: Text(TranslationBase.of(context).lb), value: false)]; _weightPopupList = <PopupMenuItem>[PopupMenuItem(child: Text(TranslationBase.of(context).kg), value: true), PopupMenuItem(child: Text(TranslationBase.of(context).lb), value: false)];
_heightPopupList = <PopupMenuItem>[PopupMenuItem(child: Text(TranslationBase.of(context).cm), value: true), PopupMenuItem(child: Text(TranslationBase.of(context).ft), value: false)]; _heightPopupList = <PopupMenuItem>[PopupMenuItem(child: Text(TranslationBase.of(context).cm), value: true), PopupMenuItem(child: Text(TranslationBase.of(context).ft), value: false)];

@ -87,10 +87,10 @@ class DoctorView extends StatelessWidget {
style: TextStyle(fontSize: 16, fontWeight: FontWeight.w600, color: Color(0xff2E303A), letterSpacing: -0.64, height: 25 / 16), style: TextStyle(fontSize: 16, fontWeight: FontWeight.w600, color: Color(0xff2E303A), letterSpacing: -0.64, height: 25 / 16),
), ),
), ),
Text( doctor.date ==null ? SizedBox() : Text(
DateUtil.getDayMonthYearDateFormatted(DateUtil.convertStringToDate(doctor.date)), DateUtil.getDayMonthYearDateFormatted(DateUtil.convertStringToDate(doctor.date)),
style: TextStyle(fontSize: 14, fontWeight: FontWeight.w600, color: Color(0xff2B353E), letterSpacing: -0.48, height: 18 / 12), style: TextStyle(fontSize: 14, fontWeight: FontWeight.w600, color: Color(0xff2B353E), letterSpacing: -0.48, height: 18 / 12),
), ) ,
], ],
), ),
if (doctor.doctorTitle != null) SizedBox(height: 6), if (doctor.doctorTitle != null) SizedBox(height: 6),

@ -37,7 +37,7 @@ class _CovidDrivethruLocationState extends State<CovidDrivethruLocation> {
String projectID = ""; String projectID = "";
List<ImagesInfo> imagesInfo = []; List<ImagesInfo> imagesInfo = [];
DriveThroughTestingCenterModel selectedProject = DriveThroughTestingCenterModel(); DriveThroughTestingCenterModel? selectedProject;
final GlobalKey locationDropdownKey = GlobalKey(); final GlobalKey locationDropdownKey = GlobalKey();
late ProjectViewModel projectViewModel; late ProjectViewModel projectViewModel;
@ -109,6 +109,7 @@ class _CovidDrivethruLocationState extends State<CovidDrivethruLocation> {
Container( Container(
height: 20, height: 20,
child: DropdownButtonHideUnderline( child: DropdownButtonHideUnderline(
//Dropdown duplicate issue
child: DropdownButton<DriveThroughTestingCenterModel>( child: DropdownButton<DriveThroughTestingCenterModel>(
onTap: () { onTap: () {
print("Clicked"); print("Clicked");
@ -117,7 +118,7 @@ class _CovidDrivethruLocationState extends State<CovidDrivethruLocation> {
hint: new Text( hint: new Text(
TranslationBase.of(context).selectAddress, TranslationBase.of(context).selectAddress,
), ),
value: selectedProject, value:selectedProject ==null || selectedProject!.projectName.isNotEmpty ?selectedProject :null,
iconSize: 0, iconSize: 0,
isExpanded: true, isExpanded: true,
style: TextStyle(fontSize: 14, letterSpacing: -0.56, color: Colors.black, fontFamily: projectViewModel.isArabic ? 'Cairo' : 'Poppins'), style: TextStyle(fontSize: 14, letterSpacing: -0.56, color: Colors.black, fontFamily: projectViewModel.isArabic ? 'Cairo' : 'Poppins'),
@ -126,7 +127,7 @@ class _CovidDrivethruLocationState extends State<CovidDrivethruLocation> {
value: item, value: item,
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [Text(item.projectName ?? ""), getCovidTestTypeImage(item)], children: [Text(item.projectName==null ? "" : item.projectName), getCovidTestTypeImage(item)],
), ),
); );
}).toList(), }).toList(),
@ -277,7 +278,7 @@ class _CovidDrivethruLocationState extends State<CovidDrivethruLocation> {
next() { next() {
if (isLocationSelected) { if (isLocationSelected) {
Navigator.push(context, FadePage(page: CovidDirveThruQuestions(projectId: projectID, proceduresList: proceduresList, selectedProject: selectedProject))); Navigator.push(context, FadePage(page: CovidDirveThruQuestions(projectId: projectID, proceduresList: proceduresList, selectedProject: selectedProject!)));
} else { } else {
Utils.showErrorToast("Please select address from the dropdown menu to continue"); Utils.showErrorToast("Please select address from the dropdown menu to continue");
} }
@ -302,7 +303,7 @@ class _CovidDrivethruLocationState extends State<CovidDrivethruLocation> {
CovidDriveThruService service = new CovidDriveThruService(); CovidDriveThruService service = new CovidDriveThruService();
CovidPaymentInfoResponse covidPaymentInfoResponse = new CovidPaymentInfoResponse(); CovidPaymentInfoResponse covidPaymentInfoResponse = new CovidPaymentInfoResponse();
GifLoaderDialogUtils.showMyDialog(context); GifLoaderDialogUtils.showMyDialog(context);
service.getCovidPaymentInformation(context, int.parse(projectID), proceduresList[0].procedureID!, selectedProject.testTypeEnum!, selectedProject.testProcedureEnum!).then((res) { service.getCovidPaymentInformation(context, int.parse(projectID), proceduresList[0].procedureID!, selectedProject!.testTypeEnum!, selectedProject!.testProcedureEnum!).then((res) {
GifLoaderDialogUtils.hideDialog(context); GifLoaderDialogUtils.hideDialog(context);
if (res['MessageStatus'] == 1) { if (res['MessageStatus'] == 1) {
setState(() { setState(() {
@ -315,7 +316,7 @@ class _CovidDrivethruLocationState extends State<CovidDrivethruLocation> {
covidPaymentInfoResponse: covidPaymentInfoResponse, covidPaymentInfoResponse: covidPaymentInfoResponse,
projectID: int.parse(projectID), projectID: int.parse(projectID),
proceduresList: proceduresList, proceduresList: proceduresList,
selectedProject: selectedProject, selectedProject: selectedProject!,
))); )));
} else {} } else {}
}).catchError((err) { }).catchError((err) {
@ -327,7 +328,7 @@ class _CovidDrivethruLocationState extends State<CovidDrivethruLocation> {
CovidDriveThruService service = new CovidDriveThruService(); CovidDriveThruService service = new CovidDriveThruService();
GifLoaderDialogUtils.showMyDialog(context); GifLoaderDialogUtils.showMyDialog(context);
service.getCovidTestProceduresList(context, selectedProject.testTypeEnum!, selectedProject.testProcedureEnum!, selectedProject.projectID!).then((res) { service.getCovidTestProceduresList(context, selectedProject!.testTypeEnum!, selectedProject!.testProcedureEnum!, selectedProject!.projectID!).then((res) {
if (res['MessageStatus'] == 1) { if (res['MessageStatus'] == 1) {
setState(() { setState(() {
res['COVID19_TestProceduresList'].forEach((v) { res['COVID19_TestProceduresList'].forEach((v) {

@ -44,7 +44,7 @@ class _SendFeedbackPageState extends State<SendFeedbackPage> {
TextEditingController messageController = TextEditingController(); TextEditingController messageController = TextEditingController();
List<String> images = []; List<String> images = [];
late String title; late String title;
AppoitmentAllHistoryResultList appointHistory = AppoitmentAllHistoryResultList(); AppoitmentAllHistoryResultList? appointHistory = AppoitmentAllHistoryResultList();
bool isShowListAppointHistory = true; bool isShowListAppointHistory = true;
String message = ""; String message = "";
final formKey = GlobalKey<FormState>(); final formKey = GlobalKey<FormState>();
@ -82,10 +82,11 @@ class _SendFeedbackPageState extends State<SendFeedbackPage> {
return TranslationBase.of(context).notClassified; return TranslationBase.of(context).notClassified;
} }
setMessageType(MessageType messageType) { setMessageType(MessageType messageType,AppoitmentAllHistoryResultList? appointHistory) {
print(widget);
setState(() { setState(() {
this.messageType = messageType; this.messageType = messageType;
this.appointHistory = widget.appointment!; this.appointHistory = appointHistory;
}); });
} }
@ -93,7 +94,7 @@ class _SendFeedbackPageState extends State<SendFeedbackPage> {
void initState() { void initState() {
setState(() { setState(() {
this.messageType = widget.messageType; this.messageType = widget.messageType;
this.appointHistory = widget.appointment ?? AppoitmentAllHistoryResultList(); this.appointHistory = widget.appointment;
}); });
// requestPermissions(); // requestPermissions();
event.controller.stream.listen((p) { event.controller.stream.listen((p) {
@ -177,15 +178,15 @@ class _SendFeedbackPageState extends State<SendFeedbackPage> {
}, },
child: DoctorCard( child: DoctorCard(
onTap: null, onTap: null,
isInOutPatient: appointHistory.isInOutPatient, isInOutPatient: appointHistory!.isInOutPatient!,
name: appointHistory.doctorTitle! + " " + appointHistory.doctorNameObj!, name: appointHistory!.doctorTitle! + " " + appointHistory!.doctorNameObj!,
// billNo: _appointmentResult.invoiceNo, // billNo: _appointmentResult.invoiceNo,
profileUrl: appointHistory.doctorImageURL, profileUrl: appointHistory!.doctorImageURL,
subName: appointHistory.projectName, subName: appointHistory!.projectName,
isLiveCareAppointment: appointHistory.isLiveCareAppointment, isLiveCareAppointment: appointHistory!.isLiveCareAppointment,
date: DateUtil.convertStringToDate(appointHistory.appointmentDate!), date: DateUtil.convertStringToDate(appointHistory!.appointmentDate!),
rating: appointHistory.actualDoctorRate! + 0.0, rating: appointHistory!.actualDoctorRate! + 0.0,
appointmentTime: appointHistory.startTime!.substring(0, 5), appointmentTime: appointHistory!.startTime!.substring(0, 5),
), ),
), ),
SizedBox(height: 12), SizedBox(height: 12),
@ -332,7 +333,7 @@ class _SendFeedbackPageState extends State<SendFeedbackPage> {
images = []; images = [];
}); });
selectedStatusIndex = 5; selectedStatusIndex = 5;
setMessageType(MessageType.NON); setMessageType(MessageType.NON, appointHistory);
GifLoaderDialogUtils.hideDialog(context); GifLoaderDialogUtils.hideDialog(context);
AppToast.showSuccessToast(message: TranslationBase.of(context).yourFeedback); AppToast.showSuccessToast(message: TranslationBase.of(context).yourFeedback);
} else { } else {
@ -511,7 +512,7 @@ class _SendFeedbackPageState extends State<SendFeedbackPage> {
} else { } else {
isShowListAppointHistory = false; isShowListAppointHistory = false;
} }
setMessageType(messageType); setMessageType(messageType, appointHistory);
}, },
), ),
); );

@ -261,7 +261,7 @@ class ServicesView extends StatelessWidget {
MaterialPageRoute( 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/hmg" //"https://twitter.com/hashtag/مجموعة_د_سليمان_الحبيب_الطبية?src=hashtag_click&f=live",
), ),
), ),
); );

@ -23,7 +23,7 @@ class AppToast {
static void showSuccessToast({ static void showSuccessToast({
required String message, required String message,
Toast toastLength = Toast.LENGTH_LONG, Toast toastLength = Toast.LENGTH_LONG,
int? timeInSeconds, int timeInSeconds =2,
double fontSize = 16, double fontSize = 16,
ToastGravity toastGravity = ToastGravity.TOP, ToastGravity toastGravity = ToastGravity.TOP,
Color textColor = Colors.white, Color textColor = Colors.white,
@ -31,7 +31,7 @@ class AppToast {
int? elevation, int? elevation,
int imageSize = 32, int imageSize = 32,
}) { }) {
Fluttertoast.showToast(msg: message, toastLength: toastLength, gravity: toastGravity, timeInSecForIosWeb: timeInSeconds!, backgroundColor: Colors.green, textColor: textColor, fontSize: fontSize); Fluttertoast.showToast(msg: message, toastLength: toastLength, gravity: toastGravity, timeInSecForIosWeb: timeInSeconds, backgroundColor: Colors.green, textColor: textColor, fontSize: fontSize);
} }
static void showErrorToast({ static void showErrorToast({

@ -128,8 +128,8 @@ class LocationUtils {
heading: 0.0, heading: 0.0,
speed: 0.0, speed: 0.0,
speedAccuracy: 1, speedAccuracy: 1,
altitudeAccuracy: 0, // altitudeAccuracy: 0,
headingAccuracy: 0, // headingAccuracy: 0,
// Added by Aamir // Added by Aamir
), ),
); );

@ -529,7 +529,7 @@ class _FloatingSearchButton extends State<FloatingSearchButton> with TickerProvi
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/hmg" // "https://twitter.com/hashtag/مجموعة_د_سليمان_الحبيب_الطبية?src=hashtag_click&f=live",
))); )));
} }
break; break;

Loading…
Cancel
Save