Haroon6138
/
PatientApp-KKUMC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updates & fixes

Browse Source
development_v2.5
haroon amjad 3 years ago
parent e03412214e
commit d75615a2eb
18 changed files with 282 additions and 269 deletions
Show Stats Download Patch File Download Diff File

2
lib/config/config.dart
Unescape Escape View File

@ -408,7 +408,7 @@ var UPDATE_COVID_QUESTIONNAIRE = 'Services/Doctors.svc/REST/COVID19_Questionnar
var CHANNEL = 3;
var GENERAL_ID = 'Cs2020@2016\$2958';
var IP_ADDRESS = '10.20.10.20';
var VERSION_ID = 9.2;
var VERSION_ID = 9.3;
var SETUP_ID = '91877';
var LANGUAGE = 2;
// var PATIENT_OUT_SA = 0;

7
lib/core/model/radiology/final_radiology.dart
Unescape Escape View File

@ -184,7 +184,8 @@ class FinalRadiologyList {
String filterName = "";
List<FinalRadiology> finalRadiologyList = List();
FinalRadiologyList({this.filterName, FinalRadiology finalRadiology}) {
finalRadiologyList.add(finalRadiology);
}
FinalRadiologyList({this.filterName, this.finalRadiologyList});
// {
// finalRadiologyList.add(finalRadiology);
// }
}

8
lib/core/service/client/base_app_client.dart
Unescape Escape View File

@ -147,10 +147,10 @@ class BaseAppClient {
}
}
// body['IdentificationNo'] = 1098574195;
// body['MobileNo'] = "537503378";
// body['PatientID'] = 1018977; //3844083
// body['TokenID'] = "@dm!n";
// body['IdentificationNo'] = 1023854217;
// body['MobileNo'] = "531940021";
body['PatientID'] = 1231755; //3844083
body['TokenID'] = "@dm!n";
// Patient ID: 3027574
// Mobile no.: 0502303285

31
lib/core/viewModels/medical/radiology_view_model.dart
Unescape Escape View File

@ -1,7 +1,7 @@
import "package:collection/collection.dart";
import 'package:diplomaticquarterapp/core/enum/filter_type.dart';
import 'package:diplomaticquarterapp/core/enum/viewstate.dart';
import 'package:diplomaticquarterapp/core/model/radiology/final_radiology.dart';
import 'package:diplomaticquarterapp/core/service/AuthenticatedUserObject.dart';
import 'package:diplomaticquarterapp/core/service/medical/radiology_service.dart';
import 'package:diplomaticquarterapp/models/Authentication/authenticated_user.dart';
import 'package:diplomaticquarterapp/uitl/app_toast.dart';
@ -25,27 +25,16 @@ class RadiologyViewModel extends BaseViewModel {
error = _radiologyService.error;
setState(ViewState.Error);
} else {
_radiologyService.finalRadiologyList.forEach((element) {
List<FinalRadiologyList> finalRadiologyListClinic = _finalRadiologyListClinic.where((elementClinic) => elementClinic.filterName == element.clinicDescription).toList();
if (finalRadiologyListClinic.length != 0) {
_finalRadiologyListClinic[finalRadiologyListClinic.indexOf(finalRadiologyListClinic[0])].finalRadiologyList.add(element);
} else {
_finalRadiologyListClinic.add(FinalRadiologyList(filterName: element.clinicDescription, finalRadiology: element));
}
// FinalRadiologyList list sort via project
List<FinalRadiologyList> finalRadiologyListHospital = _finalRadiologyListHospital
.where(
(elementClinic) => elementClinic.filterName == element.projectName,
)
.toList();
//Clinic Sorting
var clinicMap = groupBy(_radiologyService.finalRadiologyList, (FinalRadiology obj) => obj.clinicDescription);
clinicMap.forEach((key, value) {
_finalRadiologyListClinic.add(FinalRadiologyList(filterName: key, finalRadiologyList: value.toList()));
});
if (finalRadiologyListHospital.length != 0) {
_finalRadiologyListHospital[finalRadiologyListHospital.indexOf(finalRadiologyListHospital[0])].finalRadiologyList.add(element);
} else {
_finalRadiologyListHospital.add(FinalRadiologyList(filterName: element.projectName, finalRadiology: element));
}
//Hospital Sorting
var hospitalMap = groupBy(_radiologyService.finalRadiologyList, (FinalRadiology obj) => obj.projectName);
hospitalMap.forEach((key, value) {
_finalRadiologyListHospital.add(FinalRadiologyList(filterName: key, finalRadiologyList: value.toList()));
});
setState(ViewState.Idle);

2
lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/orders_log_details_page.dart
Unescape Escape View File

@ -60,7 +60,7 @@ class OrdersLogDetailsPage extends StatelessWidget {
padding: EdgeInsets.all(21),
physics: BouncingScrollPhysics(),
itemBuilder: (context, index) {
GetCMCAllOrdersResponseModel order = model.cmcAllPresOrders[index];
GetCMCAllOrdersResponseModel order = model.cmcAllPresOrders.reversed.toList()[index];
int status = order.statusId;
String _statusDisp = order.statusText;

2
lib/pages/AlHabibMedicalService/HomeHealthCare/orders_log_details_page.dart
Unescape Escape View File

@ -55,7 +55,7 @@ class OrdersLogDetailsPage extends StatelessWidget {
padding: EdgeInsets.all(21),
physics: BouncingScrollPhysics(),
itemBuilder: (context, index) {
GetCMCAllOrdersResponseModel order = model.hhcAllPresOrders[index];
GetCMCAllOrdersResponseModel order = model.hhcAllPresOrders.reversed.toList()[index];
int status = order.statusId;
String _statusDisp = order.statusText;

5
lib/pages/BookAppointment/SearchResults.dart
Unescape Escape View File

@ -4,6 +4,7 @@ import 'package:diplomaticquarterapp/models/Appointments/OBGyneProcedureListResp
import 'package:diplomaticquarterapp/pages/BookAppointment/widgets/DoctorView.dart';
import 'package:diplomaticquarterapp/theme/colors.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/uitl/utils_new.dart';
import 'package:diplomaticquarterapp/widgets/others/app_expandable_notifier.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:flutter/material.dart';
@ -36,7 +37,7 @@ class _SearchResultsState extends State<SearchResults> {
showNewAppBarTitle: true,
showNewAppBar: true,
backgroundColor: CustomColors.appBackgroudGrey2Color,
body: ListView.separated(
body: widget.patientDoctorAppointmentListHospital.isNotEmpty ? ListView.separated(
physics: BouncingScrollPhysics(),
separatorBuilder: (context, index) {
return Container(
@ -70,7 +71,7 @@ class _SearchResultsState extends State<SearchResults> {
);
},
itemCount: widget.patientDoctorAppointmentListHospital.length,
),
) : getNoDataWidget(context),
);
}
}

137
lib/pages/ErService/AmbulanceRequestIndexPages/PickupLocation.dart
Unescape Escape View File

@ -6,7 +6,6 @@ import 'package:diplomaticquarterapp/core/viewModels/er/am_request_view_model.da
import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
import 'package:diplomaticquarterapp/models/Appointments/AppoimentAllHistoryResultList.dart';
import 'package:diplomaticquarterapp/models/ambulanceRequest/locationDetails.dart';
import 'package:diplomaticquarterapp/pages/ErService/widgets/AppointmentCard.dart';
import 'package:diplomaticquarterapp/uitl/ProgressDialog.dart';
import 'package:diplomaticquarterapp/uitl/app_toast.dart';
import 'package:diplomaticquarterapp/uitl/date_uitl.dart';
@ -14,13 +13,13 @@ import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart';
import 'package:diplomaticquarterapp/uitl/location_util.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/widgets/buttons/defaultButton.dart';
import 'package:diplomaticquarterapp/widgets/data_display/medical/doctor_card.dart';
import 'package:diplomaticquarterapp/widgets/dialogs/radio_selection_dialog.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:diplomaticquarterapp/widgets/pickupLocation/PickupLocationFromMap.dart';
import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:geolocator/geolocator.dart';
import 'package:provider/provider.dart';
import '../AvailableAppointmentsPage.dart';
@ -42,6 +41,7 @@ class PickupLocation extends StatefulWidget {
class _PickupLocationState extends State<PickupLocation> {
bool _isInsideHome = false;
HaveAppointment _haveAppointment = HaveAppointment.NO;
// double _latitude;
// double _longitude;
AppoitmentAllHistoryResultList myAppointment;
@ -284,66 +284,77 @@ class _PickupLocationState extends State<PickupLocation> {
SizedBox(
height: 12,
),
AppointmentCard(
appointment: myAppointment,
)
DoctorCard(
isInOutPatient: myAppointment.isInOutPatient,
name: myAppointment.doctorTitle + " " + myAppointment.doctorNameObj,
profileUrl: myAppointment.doctorImageURL,
subName: myAppointment.clinicName,
isLiveCareAppointment: myAppointment.isLiveCareAppointment,
date: DateUtil.convertStringToDate(myAppointment.appointmentDate),
isSortByClinic: false,
rating: myAppointment.actualDoctorRate + 0.0,
appointmentTime: myAppointment.isLiveCareAppointment
? DateUtil.convertStringToDate(myAppointment.appointmentDate).toString().split(" ")[1].substring(0, 5)
: myAppointment.startTime.substring(0, 5),
remainingTimeInMinutes: null),
],
),
SizedBox(
height: 12,
),
Text(TranslationBase.of(context).dropoffLocation, style: TextStyle(fontSize: 16.0, letterSpacing: -0.64, fontWeight: FontWeight.w600)),
if (_haveAppointment == HaveAppointment.NO) Text(TranslationBase.of(context).dropoffLocation, style: TextStyle(fontSize: 16.0, letterSpacing: -0.64, fontWeight: FontWeight.w600)),
SizedBox(
height: 8,
),
Container(
padding: EdgeInsets.only(left: 16, right: 16, bottom: 15, top: 15),
alignment: Alignment.center,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(12),
color: Colors.white,
border: Border.all(
color: Color(0xffefefef),
width: 1,
if (_haveAppointment == HaveAppointment.NO)
Container(
padding: EdgeInsets.only(left: 16, right: 16, bottom: 15, top: 15),
alignment: Alignment.center,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(12),
color: Colors.white,
border: Border.all(
color: Color(0xffefefef),
width: 1,
),
),
),
child: InkWell(
onTap: () {
confirmSelectHospitalDialog(widget.amRequestViewModel.hospitals);
},
child: Row(
children: [
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
TranslationBase.of(context).selectHospital,
style: TextStyle(
fontSize: 11,
fontWeight: FontWeight.w600,
color: Color(0xff2B353E),
letterSpacing: -0.44,
child: InkWell(
onTap: () {
confirmSelectHospitalDialog(widget.amRequestViewModel.hospitals);
},
child: Row(
children: [
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
TranslationBase.of(context).selectHospital,
style: TextStyle(
fontSize: 11,
fontWeight: FontWeight.w600,
color: Color(0xff2B353E),
letterSpacing: -0.44,
),
),
),
Text(
getHospitalName(""),
style: TextStyle(
fontSize: 14,
height: 21 / 14,
fontWeight: FontWeight.w400,
color: Color(0xff2B353E),
letterSpacing: -0.44,
Text(
getHospitalName(""),
style: TextStyle(
fontSize: 14,
height: 21 / 14,
fontWeight: FontWeight.w400,
color: Color(0xff2B353E),
letterSpacing: -0.44,
),
),
),
],
],
),
),
),
Icon(Icons.arrow_drop_down),
],
Icon(Icons.arrow_drop_down),
],
),
),
),
),
],
),
if (widget.patientER_RC.transportationDetails.direction == 1)
@ -492,8 +503,6 @@ class _PickupLocationState extends State<PickupLocation> {
color: Theme.of(context).scaffoldBackgroundColor,
padding: EdgeInsets.all(12.0),
child: DefaultButton(
// color: Colors.grey[800],
// textColor: Colors.white,
TranslationBase.of(context).next,
() {
if (_result == null || _selectedHospital == null)
@ -501,29 +510,21 @@ class _PickupLocationState extends State<PickupLocation> {
else
setState(() {
widget.patientER_RC.transportationDetails.pickupSpot = _isInsideHome ? 1 : 0;
if (widget.patientER_RC.transportationDetails.direction == 0) { // To Hospital
if (widget.patientER_RC.transportationDetails.direction == 0) {
// To Hospital
widget.patientER_RC.transportationDetails.dropoffLatitude = _result.lat.toStringAsFixed(6);
widget.patientER_RC.transportationDetails.dropoffLongitude = _result.long.toStringAsFixed(6);
widget.patientER_RC.transportationDetails.pickupLatitude = _selectedHospital.latitude;
widget.patientER_RC.transportationDetails.pickupLongitude = _selectedHospital.longitude;
} else { // From Hospital
} else {
// From Hospital
widget.patientER_RC.transportationDetails.pickupLatitude = _selectedHospital.latitude;
widget.patientER_RC.transportationDetails.pickupLongitude = _selectedHospital.longitude;
widget.patientER_RC.transportationDetails.dropoffLatitude = _result.lat.toStringAsFixed(6);
widget.patientER_RC.transportationDetails.dropoffLongitude = _result.long.toStringAsFixed(6);
}
// widget.patientER.latitude =
// widget.patientER.pickupLocationLattitude;
// widget.patientER.longitude =
// widget.patientER.pickupLocationLongitude;
widget.patientER_RC.transportationDetails.dropoffLocationName = widget.patientER_RC.transportationDetails.direction == 1 ? _result.formattedAddress : _selectedHospital.name;
// widget.patientER_RC.crea =
// widget.amRequestViewModel.user.patientID;
// widget.patientER_RC.patientOutSA = widget.amRequestViewModel.user.outSA == 0 ? false : true;
// widget.patientER_RC.patientOutSa = widget.amRequestViewModel.user.outSA;
widget.patientER_RC.patientIdentificationID = widget.amRequestViewModel.user.patientIdentificationNo;
widget.patientER_RC.transportationDetails.pickupDateTime = DateUtil.convertDateToStringLocation(DateTime.now());
@ -531,7 +532,6 @@ class _PickupLocationState extends State<PickupLocation> {
widget.patientER_RC.projectID = widget.amRequestViewModel.user.projectID;
widget.patientER_RC.patientID = widget.amRequestViewModel.user.patientID;
widget.patientER_RC.transportationDetails.requesterIsOutSA = false;
// widget.patientER.lineItemNo = 0;
widget.patientER_RC.transportationDetails.requesterMobileNo = widget.amRequestViewModel.user.mobileNumber;
widget.patientER_RC.transportationDetails.requesterFileNo = widget.amRequestViewModel.user.patientID;
@ -542,6 +542,9 @@ class _PickupLocationState extends State<PickupLocation> {
widget.patientER_RC.transportationDetails.appointmentBranch = myAppointment.projectName;
widget.patientER_RC.transportationDetails.appointmentTime = myAppointment.appointmentDate;
widget.patientER_RC.transportationDetails.haveAppointment = 1;
widget.patientER_RC.transportationDetails.dropoffLatitude = myAppointment.latitude;
widget.patientER_RC.transportationDetails.dropoffLongitude = myAppointment.longitude;
widget.patientER_RC.transportationDetails.dropoffLocationName = myAppointment.projectName;
} else {
widget.patientER_RC.transportationDetails.appointmentNo = "0";
widget.patientER_RC.transportationDetails.appointmentClinicName = "";
@ -555,7 +558,6 @@ class _PickupLocationState extends State<PickupLocation> {
widget.changeCurrentTab(2);
});
},
// label: TranslationBase.of(context).next,
),
),
);
@ -608,6 +610,13 @@ class _PickupLocationState extends State<PickupLocation> {
if (value != null)
setState(() {
myAppointment = value;
HospitalsModel hospitalsModel = HospitalsModel();
hospitalsModel.name = myAppointment.projectName;
hospitalsModel.iD = myAppointment.projectID;
hospitalsModel.mainProjectID = myAppointment.projectID;
hospitalsModel.latitude = myAppointment.latitude;
hospitalsModel.longitude = myAppointment.longitude;
_selectedHospital = hospitalsModel;
});
else {
ProgressDialogUtil.hideProgressDialog(context);

33
lib/pages/ErService/AvailableAppointmentsPage.dart
Unescape Escape View File

@ -1,6 +1,7 @@
import 'package:diplomaticquarterapp/models/Appointments/AppoimentAllHistoryResultList.dart';
import 'package:diplomaticquarterapp/pages/ErService/widgets/AppointmentCard.dart';
import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
import 'package:diplomaticquarterapp/uitl/date_uitl.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/widgets/data_display/medical/doctor_card.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
@ -8,30 +9,44 @@ import 'package:flutter/material.dart';
class AvailableAppointmentsPage extends StatelessWidget {
final List<AppoitmentAllHistoryResultList> appointmentsAllHistoryList;
const AvailableAppointmentsPage({Key key, this.appointmentsAllHistoryList})
: super(key: key);
const AvailableAppointmentsPage({Key key, this.appointmentsAllHistoryList}) : super(key: key);
@override
Widget build(BuildContext context) {
return AppScaffold(
isShowAppBar: true,
appBarTitle: 'Available Appointments',
appBarTitle: TranslationBase.of(context).myAppointmentsList,
showNewAppBar: true,
backgroundColor: Color(0xffF8F8F8),
showNewAppBarTitle: true,
body: SingleChildScrollView(
child: Container(
padding: EdgeInsets.only(bottom: 14, top: 14, left: 21, right: 21),
child: Column(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Texts('Available Appointments'),
SizedBox(
height: 12,
),
...List.generate(
appointmentsAllHistoryList.length,
(index) => InkWell(
onTap: (){
onTap: () {
Navigator.pop(context, appointmentsAllHistoryList[index]);
},
child: AppointmentCard(appointment: appointmentsAllHistoryList[index],),
child: DoctorCard(
isInOutPatient: appointmentsAllHistoryList[index].isInOutPatient,
name: appointmentsAllHistoryList[index].doctorTitle + " " + appointmentsAllHistoryList[index].doctorNameObj,
profileUrl: appointmentsAllHistoryList[index].doctorImageURL,
subName: appointmentsAllHistoryList[index].clinicName,
isLiveCareAppointment: appointmentsAllHistoryList[index].isLiveCareAppointment,
date: DateUtil.convertStringToDate(appointmentsAllHistoryList[index].appointmentDate),
isSortByClinic: false,
rating: appointmentsAllHistoryList[index].actualDoctorRate + 0.0,
appointmentTime: appointmentsAllHistoryList[index].isLiveCareAppointment
? DateUtil.convertStringToDate(appointmentsAllHistoryList[index].appointmentDate).toString().split(" ")[1].substring(0, 5)
: appointmentsAllHistoryList[index].startTime.substring(0, 5),
remainingTimeInMinutes: null),
),
)
],
@ -41,5 +56,3 @@ class AvailableAppointmentsPage extends StatelessWidget {
);
}
}

4
lib/pages/ErService/OrderLogPage.dart
Unescape Escape View File

@ -51,10 +51,10 @@ class OrderLogPage extends StatelessWidget {
child: amRequestViewModel.patientAmbulanceRequestOrdersList.length > 0
? ListView.builder(
padding: EdgeInsets.all(21),
reverse: true,
reverse: false,
itemCount: amRequestViewModel.patientAmbulanceRequestOrdersList.length,
itemBuilder: (context, index) {
AmbulanceRequestOrdersModel order = amRequestViewModel.patientAmbulanceRequestOrdersList[index];
AmbulanceRequestOrdersModel order = amRequestViewModel.patientAmbulanceRequestOrdersList.reversed.toList()[index];
int status = order.statusId;
String _statusDisp = order.statusText;

2
lib/pages/ErService/rapid-response-team/rrt-logs-page.dart
Unescape Escape View File

@ -41,7 +41,7 @@ class RRTLogPageState extends State<RRTLogPage> {
itemCount: widget.orders.length,
padding: EdgeInsets.all(21),
itemBuilder: (ctx, idx) {
var order = widget.orders[idx];
var order = widget.orders.reversed.toList()[idx];
return RRTLogListItem(order, onCancel: deleteOrder);
})
: getNoDataWidget(context);

32
lib/pages/medical/active_medications/ActiveMedicationsPage.dart
Unescape Escape View File

@ -51,22 +51,22 @@ class ActiveMedicationsPage extends StatelessWidget {
children: [
Row(
children: [
Container(
child: Container(
child: Image.memory(
Utils.dataFromBase64String(model.activePrescriptionReport[index].imageString),
fit: BoxFit.cover,
height: SizeConfig.imageSizeMultiplier * 19,
width: SizeConfig.imageSizeMultiplier * 18,
),
margin: EdgeInsets.zero,
clipBehavior: Clip.antiAlias,
decoration: cardRadius(2000),
),
clipBehavior: Clip.antiAlias,
decoration: containerColorRadiusBorderWidth(Colors.white, 200, Colors.grey[200], 1),
),
mWidth(12),
// Container(
// child: Container(
// child: Image.memory(
// Utils.dataFromBase64String(model.activePrescriptionReport[index].imageString),
// fit: BoxFit.cover,
// height: SizeConfig.imageSizeMultiplier * 19,
// width: SizeConfig.imageSizeMultiplier * 18,
// ),
// margin: EdgeInsets.zero,
// clipBehavior: Clip.antiAlias,
// decoration: cardRadius(2000),
// ),
// clipBehavior: Clip.antiAlias,
// decoration: containerColorRadiusBorderWidth(Colors.white, 200, Colors.grey[200], 1),
// ),
// mWidth(12),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [

74
lib/pages/medical/prescriptions/PrescriptionOrderOverveiw.dart
Unescape Escape View File

@ -105,43 +105,43 @@ class PrescriptionOrderOverview extends StatelessWidget {
// decoration: cardRadius(0),
child: Row(
children: <Widget>[
InkWell(
onTap: () {
showZoomImageDialog(context, prescriptionReportEnhList[index].imageSRCUrl);
},
child: Stack(
alignment: Alignment.center,
children: [
Container(
margin: EdgeInsets.only(bottom: 10.0),
decoration: BoxDecoration(
border: Border.all(width: 1.0, color: Color(0xffEBEBEB)),
borderRadius: BorderRadius.all(Radius.circular(30.0)),
),
child: ClipRRect(
borderRadius: BorderRadius.all(Radius.circular(30)),
child: Image.network(
prescriptionReportEnhList[index].imageSRCUrl,
fit: BoxFit.cover,
width: 48,
height: 48,
),
),
),
Container(
margin: EdgeInsets.only(bottom: 10.0),
child: Icon(
Icons.search,
size: 18,
color: Colors.white,
),
padding: EdgeInsets.all(3),
decoration: containerRadius(Colors.black.withOpacity(0.3), 200),
)
],
),
),
SizedBox(width: 14),
// InkWell(
// onTap: () {
// showZoomImageDialog(context, prescriptionReportEnhList[index].imageSRCUrl);
// },
// child: Stack(
// alignment: Alignment.center,
// children: [
// Container(
// margin: EdgeInsets.only(bottom: 10.0),
// decoration: BoxDecoration(
// border: Border.all(width: 1.0, color: Color(0xffEBEBEB)),
// borderRadius: BorderRadius.all(Radius.circular(30.0)),
// ),
// child: ClipRRect(
// borderRadius: BorderRadius.all(Radius.circular(30)),
// child: Image.network(
// prescriptionReportEnhList[index].imageSRCUrl,
// fit: BoxFit.cover,
// width: 48,
// height: 48,
// ),
// ),
// ),
// Container(
// margin: EdgeInsets.only(bottom: 10.0),
// child: Icon(
// Icons.search,
// size: 18,
// color: Colors.white,
// ),
// padding: EdgeInsets.all(3),
// decoration: containerRadius(Colors.black.withOpacity(0.3), 200),
// )
// ],
// ),
// ),
// SizedBox(width: 14),
Expanded(
child: Padding(
padding: const EdgeInsets.all(8.0),

62
lib/pages/medical/prescriptions/prescription_details_page.dart
Unescape Escape View File

@ -102,37 +102,37 @@ class _PrescriptionDetailsPageState extends State<PrescriptionDetailsPage> {
children: [
Row(
children: <Widget>[
InkWell(
child: Stack(
alignment: Alignment.center,
children: [
Container(
child: Image.network(
widget.prescriptionReport.imageSRCUrl,
fit: BoxFit.cover,
width: 48,
height: 49,
),
margin: EdgeInsets.zero,
clipBehavior: Clip.antiAlias,
decoration: cardRadius(2000),
),
Container(
child: Icon(
Icons.search,
size: 18,
color: Colors.white,
),
padding: EdgeInsets.all(6),
decoration: containerRadius(Colors.black.withOpacity(0.3), 200),
)
],
),
onTap: () {
showZoomImageDialog(context, widget.prescriptionReport.imageSRCUrl);
},
),
SizedBox(width: 12),
// InkWell(
// child: Stack(
// alignment: Alignment.center,
// children: [
// Container(
// child: Image.network(
// widget.prescriptionReport.imageSRCUrl,
// fit: BoxFit.cover,
// width: 48,
// height: 49,
// ),
// margin: EdgeInsets.zero,
// clipBehavior: Clip.antiAlias,
// decoration: cardRadius(2000),
// ),
// Container(
// child: Icon(
// Icons.search,
// size: 18,
// color: Colors.white,
// ),
// padding: EdgeInsets.all(6),
// decoration: containerRadius(Colors.black.withOpacity(0.3), 200),
// )
// ],
// ),
// onTap: () {
// showZoomImageDialog(context, widget.prescriptionReport.imageSRCUrl);
// },
// ),
// SizedBox(width: 12),
Expanded(
child: Text(
(widget.prescriptionReport.itemDescription.isNotEmpty ? widget.prescriptionReport.itemDescription : widget.prescriptionReport.itemDescriptionN ?? '')

136
lib/pages/medical/prescriptions/prescription_items_page.dart
Unescape Escape View File

@ -113,40 +113,40 @@ class PrescriptionItemsPage extends StatelessWidget {
mHeight(10),
Row(
children: [
InkWell(
child: Stack(
alignment: Alignment.center,
children: [
Container(
child: Image.network(
model.prescriptionReportListINP[index].imageSRCUrl,
fit: BoxFit.cover,
width: 60,
height: 60,
),
margin: EdgeInsets.zero,
clipBehavior: Clip.antiAlias,
decoration: cardRadius(2000),
),
Container(
child: Icon(
Icons.search,
size: 18,
color: Colors.white,
),
padding: EdgeInsets.all(6),
decoration: containerRadius(Colors.black.withOpacity(0.3), 200),
)
],
),
onTap: () {
showZoomImageDialog(
context,
model.prescriptionReportListINP[index].imageSRCUrl,
);
},
),
mWidth(12),
// InkWell(
// child: Stack(
// alignment: Alignment.center,
// children: [
// Container(
// child: Image.network(
// model.prescriptionReportListINP[index].imageSRCUrl,
// fit: BoxFit.cover,
// width: 60,
// height: 60,
// ),
// margin: EdgeInsets.zero,
// clipBehavior: Clip.antiAlias,
// decoration: cardRadius(2000),
// ),
// Container(
// child: Icon(
// Icons.search,
// size: 18,
// color: Colors.white,
// ),
// padding: EdgeInsets.all(6),
// decoration: containerRadius(Colors.black.withOpacity(0.3), 200),
// )
// ],
// ),
// onTap: () {
// showZoomImageDialog(
// context,
// model.prescriptionReportListINP[index].imageSRCUrl,
// );
// },
// ),
// mWidth(12),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
@ -299,40 +299,40 @@ class PrescriptionItemsPage extends StatelessWidget {
Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
InkWell(
child: Stack(
alignment: Alignment.center,
children: [
Container(
child: Image.network(
model.prescriptionReportEnhList[index].imageSRCUrl,
fit: BoxFit.cover,
width: 60,
height: 60,
),
margin: EdgeInsets.zero,
clipBehavior: Clip.antiAlias,
decoration: cardRadius(2000),
),
Container(
child: Icon(
Icons.search,
size: 18,
color: Colors.white,
),
padding: EdgeInsets.all(6),
decoration: containerRadius(Colors.black.withOpacity(0.3), 200),
)
],
),
onTap: () {
showZoomImageDialog(
context,
model.prescriptionReportEnhList[index].imageSRCUrl,
);
},
),
mWidth(12),
// InkWell(
// child: Stack(
// alignment: Alignment.center,
// children: [
// Container(
// child: Image.network(
// model.prescriptionReportEnhList[index].imageSRCUrl,
// fit: BoxFit.cover,
// width: 60,
// height: 60,
// ),
// margin: EdgeInsets.zero,
// clipBehavior: Clip.antiAlias,
// decoration: cardRadius(2000),
// ),
// Container(
// child: Icon(
// Icons.search,
// size: 18,
// color: Colors.white,
// ),
// padding: EdgeInsets.all(6),
// decoration: containerRadius(Colors.black.withOpacity(0.3), 200),
// )
// ],
// ),
// onTap: () {
// showZoomImageDialog(
// context,
// model.prescriptionReportEnhList[index].imageSRCUrl,
// );
// },
// ),
// mWidth(12),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,

2
lib/services/authentication/auth_provider.dart
Unescape Escape View File

@ -288,7 +288,7 @@ class AuthProvider with ChangeNotifier {
neRequest.iPAdress = IP_ADDRESS;
neRequest.generalid = GENERAL_ID;
// request.languageID = (languageID == 'ar' ? 1 : 2);
request.deviceTypeID = Platform.isIOS ? 1 : 2;
neRequest.deviceTypeID = Platform.isIOS ? 1 : 2;
neRequest.patientOutSA = neRequest.zipCode == '966' ? 0 : 1;
neRequest.projectOutSA = neRequest.zipCode == '966' ? false : true;
neRequest.isDentalAllowedBackend = false;

8
lib/widgets/in_app_browser/InAppBrowser.dart
Unescape Escape View File

@ -36,13 +36,13 @@ class MyInAppBrowser extends InAppBrowser {
// static String APPLE_PAY_PAYFORT_URL = 'https://hmgwebservices.com/PayFortWebLive/PayFortApi/MakeApplePayRequest'; // Payfort Payment Gateway URL LIVE
static String APPLE_PAY_PAYFORT_URL = 'https://hmgwebservices.com/PayFortWebLive/PayFortApi/MakeApplePayRequest'; // Payfort Payment Gateway URL UAT
static String SERVICE_URL = 'https://hmgwebservices.com/PayFortWeb/pages/SendPayFortRequest.aspx'; // Payfort Payment Gateway URL UAT
// static String SERVICE_URL = 'https://hmgwebservices.com/PayFortWeb/pages/SendPayFortRequest.aspx'; // Payfort Payment Gateway URL UAT
// static String SERVICE_URL = 'https://hmgwebservices.com/PayFortWebLive/pages/SendPayFortRequest.aspx'; //Payfort Payment Gateway URL LIVE
static String SERVICE_URL = 'https://hmgwebservices.com/PayFortWebLive/pages/SendPayFortRequest.aspx'; //Payfort Payment Gateway URL LIVE
static String PREAUTH_SERVICE_URL = 'https://hmgwebservices.com/PayFortWeb/pages/SendPayFortRequest.aspx'; // Payfort PreAuth Payment Gateway URL UAT
// static String PREAUTH_SERVICE_URL = 'https://hmgwebservices.com/PayFortWeb/pages/SendPayFortRequest.aspx'; // Payfort PreAuth Payment Gateway URL UAT
// static String PREAUTH_SERVICE_URL = 'https://hmgwebservices.com/PayFortWebLive/pages/SendPayFortRequest.aspx'; //Payfort PreAuth Payment Gateway URL Live Store
static String PREAUTH_SERVICE_URL = 'https://hmgwebservices.com/PayFortWebLive/pages/SendPayFortRequest.aspx'; //Payfort PreAuth Payment Gateway URL Live Store
// static String PRESCRIPTION_PAYMENT_WITH_ORDERID =
// 'https://uat.hmgwebservices.com/epharmacy/checkout/OpcCompleteRedirectionPaymentClientbyOrder?orderID=';

4
pubspec.yaml
Unescape Escape View File

@ -1,7 +1,7 @@
name: diplomaticquarterapp
description: A new Flutter application.
version: 4.4.999+4040999
version: 4.5.001+4050001
environment:
sdk: ">=2.7.0 <3.0.0"
@ -89,7 +89,7 @@ dependencies:
google_maps_flutter: ^2.1.1
# Huawei
huawei_map: 6.0.1+304
huawei_map: 6.0.1+305
huawei_push: ^5.3.0+304
# Qr code Scanner TODO fix it

Write Preview
Loading…
Cancel
Save