Merge branch 'dev_v3.13.6' into dev_3.13.6_CR5047_LiveCare_Enhancements
# Conflicts: # lib/config/config.dart # lib/main.dart # lib/splashPage.dart # lib/uitl/CalendarUtils.dart # lib/uitl/translations_delegate_base.dartdev_3.13.6_CR5047_LiveCare_Enhancements
commit
3f22d69058
Binary file not shown.
Binary file not shown.
|
After Width: | Height: | Size: 19 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 32 KiB |
@ -0,0 +1,22 @@
|
||||
class GetPatientOccupationListResponse {
|
||||
String? occupationID;
|
||||
String? description;
|
||||
String? descriptionN;
|
||||
|
||||
GetPatientOccupationListResponse(
|
||||
{this.occupationID, this.description, this.descriptionN});
|
||||
|
||||
GetPatientOccupationListResponse.fromJson(Map<String, dynamic> json) {
|
||||
occupationID = json['OccupationID'];
|
||||
description = json['Description'];
|
||||
descriptionN = json['DescriptionN'];
|
||||
}
|
||||
|
||||
Map<String, dynamic> toJson() {
|
||||
final Map<String, dynamic> data = new Map<String, dynamic>();
|
||||
data['OccupationID'] = this.occupationID;
|
||||
data['Description'] = this.description;
|
||||
data['DescriptionN'] = this.descriptionN;
|
||||
return data;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,374 @@
|
||||
import 'dart:typed_data';
|
||||
|
||||
import 'package:barcode_scan2/barcode_scan2.dart';
|
||||
import 'package:diplomaticquarterapp/analytics/google-analytics.dart';
|
||||
import 'package:diplomaticquarterapp/config/shared_pref_kay.dart';
|
||||
import 'package:diplomaticquarterapp/core/model/privilege/ProjectDetailListModel.dart';
|
||||
import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
|
||||
import 'package:diplomaticquarterapp/locator.dart';
|
||||
import 'package:diplomaticquarterapp/models/Appointments/AppoimentAllHistoryResultList.dart';
|
||||
import 'package:diplomaticquarterapp/models/Appointments/DoctorListResponse.dart';
|
||||
import 'package:diplomaticquarterapp/models/Appointments/PatientShareResposne.dart';
|
||||
import 'package:diplomaticquarterapp/models/Authentication/authenticated_user.dart';
|
||||
import 'package:diplomaticquarterapp/models/header_model.dart';
|
||||
import 'package:diplomaticquarterapp/pages/landing/landing_page.dart';
|
||||
import 'package:diplomaticquarterapp/routes.dart';
|
||||
import 'package:diplomaticquarterapp/services/appointment_services/GetDoctorsList.dart';
|
||||
import 'package:diplomaticquarterapp/theme/colors.dart';
|
||||
import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart';
|
||||
import 'package:diplomaticquarterapp/uitl/app_toast.dart';
|
||||
import 'package:diplomaticquarterapp/uitl/date_uitl.dart';
|
||||
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/uitl/utils.dart';
|
||||
import 'package:diplomaticquarterapp/uitl/utils_new.dart';
|
||||
import 'package:diplomaticquarterapp/widgets/buttons/custom_text_button.dart';
|
||||
import 'package:diplomaticquarterapp/widgets/data_display/medical/medical_profile_item.dart';
|
||||
import 'package:diplomaticquarterapp/widgets/dialogs/confirm_dialog.dart';
|
||||
import 'package:diplomaticquarterapp/widgets/new_design/doctor_header.dart';
|
||||
import 'package:diplomaticquarterapp/widgets/nfc/nfc_reader_sheet.dart';
|
||||
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_nfc_kit/flutter_nfc_kit.dart';
|
||||
import 'package:flutter_svg/flutter_svg.dart';
|
||||
import 'package:provider/provider.dart';
|
||||
|
||||
class EROnlineCheckInNFCQRLocation extends StatefulWidget {
|
||||
// late PatientShareResponse? patientShareResponse;
|
||||
// late AppoitmentAllHistoryResultList? appointment;
|
||||
// late String? appoQR;
|
||||
// AuthenticatedUser? authUser;
|
||||
// AppSharedPreferences sharedPref = AppSharedPreferences();
|
||||
|
||||
int projectID;
|
||||
|
||||
EROnlineCheckInNFCQRLocation({required this.projectID});
|
||||
|
||||
@override
|
||||
_EROnlineCheckInNFCQRLocationState createState() => _EROnlineCheckInNFCQRLocationState();
|
||||
}
|
||||
|
||||
class _EROnlineCheckInNFCQRLocationState extends State<EROnlineCheckInNFCQRLocation> {
|
||||
late Uint8List _bytes;
|
||||
bool _supportsNFC = false;
|
||||
late BuildContext _context;
|
||||
|
||||
late ProjectViewModel projectViewModel;
|
||||
late LocationUtils locationUtils;
|
||||
ProjectDetailListModel projectDetailListModel = ProjectDetailListModel();
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
}
|
||||
|
||||
startNFCScan() {
|
||||
Future.delayed(const Duration(milliseconds: 500), () {
|
||||
showNfcReader(context, onNcfScan: (String nfcId) {
|
||||
Future.delayed(const Duration(milliseconds: 100), () {
|
||||
sendNfcCheckInRequest(nfcId, 2);
|
||||
});
|
||||
}, onCancel: () {
|
||||
// Navigator.of(context).pop();
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
startQRCodeScan() async {
|
||||
String onlineCheckInQRCode = (await BarcodeScanner.scan().then((value) => value.rawContent));
|
||||
if (onlineCheckInQRCode != "") {
|
||||
sendNfcCheckInRequest(onlineCheckInQRCode, 2);
|
||||
} else {}
|
||||
}
|
||||
|
||||
startLocationCheckIn() async {
|
||||
GifLoaderDialogUtils.showMyDialog(context);
|
||||
locationUtils = new LocationUtils(isShowConfirmDialog: true, context: context);
|
||||
locationUtils.getCurrentLocation(callBack: (value) {
|
||||
projectDetailListModel = Utils.getProjectDetailObj(projectViewModel, widget.projectID);
|
||||
double dist = Utils.distance(value.latitude, value.longitude, double.parse(projectDetailListModel.latitude!), double.parse(projectDetailListModel.longitude!)).ceilToDouble() * 1000;
|
||||
print(dist);
|
||||
if (dist <= projectDetailListModel.geofenceRadius!) {
|
||||
sendNfcCheckInRequest(projectDetailListModel.checkInQrCode!, 2);
|
||||
} else {
|
||||
GifLoaderDialogUtils.hideDialog(context);
|
||||
AppToast.showErrorToast(message: TranslationBase.of(context).locationCheckInError);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
projectViewModel = Provider.of(context);
|
||||
_context = context;
|
||||
FlutterNfcKit.nfcAvailability.then((value) {
|
||||
_supportsNFC = (value == NFCAvailability.available);
|
||||
});
|
||||
List<Widget> checkInOptionsList = getCheckInOptionsList(context);
|
||||
return AppScaffold(
|
||||
appBarTitle: TranslationBase.of(context).onlineCheckIn,
|
||||
isShowAppBar: true,
|
||||
showNewAppBar: true,
|
||||
showNewAppBarTitle: true,
|
||||
body: SingleChildScrollView(
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
// DoctorHeader(
|
||||
// headerModel: HeaderModel(
|
||||
// widget.appointment!.doctorTitle! + " " + widget.appointment!.doctorNameObj!,
|
||||
// widget.appointment!.doctorID ?? 0,
|
||||
// widget.appointment!.doctorImageURL!,
|
||||
// widget.appointment!.doctorSpeciality!,
|
||||
// "",
|
||||
// widget.appointment!.projectName!,
|
||||
// DateUtil.convertStringToDate(widget.appointment!.appointmentDate!),
|
||||
// widget.appointment!.isLiveCareAppointment!
|
||||
// ? DateUtil.convertStringToDate(widget.appointment!.appointmentDate!).toString().split(" ")[1].substring(0, 5)
|
||||
// : widget.appointment!.startTime!.substring(0, 5),
|
||||
// "null",
|
||||
// widget.appointment!.doctorRate,
|
||||
// widget.appointment!.actualDoctorRate,
|
||||
// widget.appointment!.noOfPatientsRate,
|
||||
// "",
|
||||
// ),
|
||||
// isShowName: true,
|
||||
// isNeedToShowButton: false,
|
||||
// buttonTitle: '',
|
||||
// onTap: () {},
|
||||
// onRatingAndReviewTap: () {},
|
||||
// ),
|
||||
InkWell(
|
||||
child: Container(
|
||||
margin: EdgeInsets.only(top: 30.0),
|
||||
padding: EdgeInsets.all(8),
|
||||
child: SvgPicture.asset(
|
||||
"assets/images/nfc/contactless.svg",
|
||||
width: 80.0,
|
||||
height: 80.0,
|
||||
),
|
||||
),
|
||||
onTap: () {
|
||||
showNfcReader(context, onNcfScan: (String nfcId) {
|
||||
Future.delayed(const Duration(milliseconds: 100), () {
|
||||
sendNfcCheckInRequest(nfcId, 2);
|
||||
});
|
||||
}, onCancel: () {
|
||||
// Navigator.of(context).pop();
|
||||
});
|
||||
},
|
||||
),
|
||||
Row(
|
||||
children: <Widget>[
|
||||
Expanded(
|
||||
child: Container(
|
||||
width: double.infinity,
|
||||
margin: EdgeInsets.only(top: 15.0, bottom: 10.0, left: 20.0, right: 20.0),
|
||||
child: Text(TranslationBase.of(context).scanQRHospital,
|
||||
style: TextStyle(
|
||||
fontSize: 20,
|
||||
fontWeight: FontWeight.w600,
|
||||
letterSpacing: -0.48,
|
||||
)),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
mHeight(21),
|
||||
Padding(
|
||||
padding: EdgeInsets.only(left: 21, right: 21),
|
||||
child: GridView.builder(
|
||||
shrinkWrap: true,
|
||||
primary: false,
|
||||
physics: NeverScrollableScrollPhysics(),
|
||||
gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(crossAxisCount: 2, childAspectRatio: 2 / 2, crossAxisSpacing: 12, mainAxisSpacing: 12),
|
||||
padding: EdgeInsets.zero,
|
||||
itemCount: checkInOptionsList.length,
|
||||
itemBuilder: (BuildContext context, int index) {
|
||||
return checkInOptionsList[index];
|
||||
},
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
// bottomSheet: Container(
|
||||
// color: CustomColors.appBackgroudGreyColor,
|
||||
// padding: EdgeInsets.all(21),
|
||||
// // height: 45.0,
|
||||
// child: Row(
|
||||
// children: [
|
||||
// Expanded(
|
||||
// flex: 1,
|
||||
// child: ButtonTheme(
|
||||
// shape: RoundedRectangleBorder(
|
||||
// borderRadius: BorderRadius.circular(10.0),
|
||||
// ),
|
||||
// height: 45.0,
|
||||
// child: CustomTextButton(
|
||||
// backgroundColor: CustomColors.green,
|
||||
// elevation: 0,
|
||||
// onPressed: () {
|
||||
// startNFCScan();
|
||||
// },
|
||||
// child: Text(TranslationBase.of(context).scanNFC,
|
||||
// style: TextStyle(
|
||||
// fontSize: 18.0,
|
||||
// color: Colors.white,
|
||||
// )),
|
||||
// ),
|
||||
// ),
|
||||
// ),
|
||||
// ],
|
||||
// ),
|
||||
// ),
|
||||
);
|
||||
}
|
||||
|
||||
List<Widget> getCheckInOptionsList(BuildContext context) {
|
||||
List<Widget> optionsList = [];
|
||||
|
||||
optionsList.add(
|
||||
InkWell(
|
||||
onTap: () {
|
||||
if (projectViewModel.havePrivilege(102)) {
|
||||
startLocationCheckIn();
|
||||
}
|
||||
},
|
||||
child: MedicalProfileItem(
|
||||
title: TranslationBase.of(context).checkInViaLocation,
|
||||
imagePath: 'location.svg',
|
||||
subTitle: "",
|
||||
isEnable: projectViewModel.havePrivilege(102),
|
||||
width: 70.0,
|
||||
height: 70.0,
|
||||
),
|
||||
),
|
||||
);
|
||||
|
||||
optionsList.add(
|
||||
InkWell(
|
||||
onTap: () {
|
||||
if (projectViewModel.havePrivilege(79)) {
|
||||
startQRCodeScan();
|
||||
}
|
||||
},
|
||||
child: MedicalProfileItem(
|
||||
title: TranslationBase.of(context).pharmaLiveCareScanQR,
|
||||
imagePath: 'qr_code.svg',
|
||||
subTitle: "",
|
||||
isEnable: projectViewModel.havePrivilege(79),
|
||||
width: 80.0,
|
||||
height: 80.0,
|
||||
),
|
||||
),
|
||||
);
|
||||
|
||||
optionsList.add(
|
||||
InkWell(
|
||||
onTap: () {
|
||||
if (projectViewModel.havePrivilege(80) && _supportsNFC) {
|
||||
startNFCScan();
|
||||
} else {
|
||||
Utils.showErrorToast(TranslationBase.of(context).NFCNotSupported);
|
||||
}
|
||||
},
|
||||
child: MedicalProfileItem(
|
||||
title: TranslationBase.of(context).scanNFC,
|
||||
imagePath: 'contactless.svg',
|
||||
subTitle: "",
|
||||
isEnable: projectViewModel.havePrivilege(80),
|
||||
width: 80.0,
|
||||
height: 80.0,
|
||||
),
|
||||
),
|
||||
);
|
||||
|
||||
return optionsList;
|
||||
}
|
||||
|
||||
Future navigateToHome(context) async {
|
||||
Navigator.of(context).pushNamed(HOME);
|
||||
}
|
||||
|
||||
getPatientShare(context, String appointmentNo, int clinicID, int projectID, DoctorList docObject) {}
|
||||
|
||||
String getDate(String appoDate) {
|
||||
var appoDateFormatted = "";
|
||||
|
||||
var dateObj = DateUtil.convertStringToDate(appoDate);
|
||||
|
||||
setState(() {
|
||||
appoDateFormatted = DateUtil.getWeekDay(dateObj.weekday) +
|
||||
", " +
|
||||
dateObj.day.toString() +
|
||||
" " +
|
||||
DateUtil.getMonth(dateObj.month) +
|
||||
" " +
|
||||
dateObj.year.toString() +
|
||||
", " +
|
||||
dateObj.hour.toString() +
|
||||
":" +
|
||||
dateObj.minute.toString() +
|
||||
":00";
|
||||
});
|
||||
|
||||
return appoDateFormatted;
|
||||
}
|
||||
|
||||
String getDoctorSpeciality(List<String> docSpecial) {
|
||||
String docSpeciality = "";
|
||||
if (docSpecial != null && docSpecial.length != 0) {
|
||||
docSpecial.forEach((v) {
|
||||
docSpeciality = docSpeciality + v + "\n";
|
||||
});
|
||||
}
|
||||
return docSpeciality;
|
||||
}
|
||||
|
||||
sendNfcCheckInRequest(String nfcId, int checkInBy) {
|
||||
GifLoaderDialogUtils.showMyDialog(context);
|
||||
|
||||
DoctorsListService service = new DoctorsListService();
|
||||
|
||||
// service.sendCheckinNfcRequest(widget!.patientShareResponse!.appointmentNo!, nfcId, widget.patientShareResponse!.projectID!, checkInBy, widget.patientShareResponse!.clinicID!, context).then((res) {
|
||||
// print(res);
|
||||
//
|
||||
// GifLoaderDialogUtils.hideDialog(context);
|
||||
// _showMyDialog(res["SuccessMsg"], this.context);
|
||||
// }).catchError((err) {
|
||||
// GifLoaderDialogUtils.hideDialog(context);
|
||||
// print(err);
|
||||
// _showMyDialog(err, this.context);
|
||||
// });
|
||||
}
|
||||
|
||||
Future<void> _showMyDialog(String message, BuildContext context) async {
|
||||
return showDialog<void>(
|
||||
context: context,
|
||||
barrierDismissible: true, // user must tap button!
|
||||
builder: (BuildContext context) {
|
||||
return AlertDialog(
|
||||
title: const Text('Alert'),
|
||||
content: SingleChildScrollView(
|
||||
child: ListBody(
|
||||
children: <Widget>[
|
||||
Text(message),
|
||||
],
|
||||
),
|
||||
),
|
||||
actions: <Widget>[
|
||||
TextButton(
|
||||
child: const Text('OK'),
|
||||
onPressed: () {
|
||||
Navigator.of(context).pop();
|
||||
Navigator.pushAndRemoveUntil(context, MaterialPageRoute(builder: (context) => LandingPage()), (Route<dynamic> r) => false);
|
||||
},
|
||||
),
|
||||
],
|
||||
);
|
||||
},
|
||||
);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,89 @@
|
||||
import 'package:diplomaticquarterapp/uitl/utils_new.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
void showMyBottomSheet(BuildContext context, {required Widget child, required VoidCallback callBackFunc, String? type}) {
|
||||
showModalBottomSheet<String>(
|
||||
context: context,
|
||||
isScrollControlled: true,
|
||||
backgroundColor: Colors.transparent,
|
||||
builder: (BuildContext context) {
|
||||
return Container(
|
||||
constraints: BoxConstraints(
|
||||
maxHeight: type =='CONTINUE_ACTION' ? MediaQuery.of(context).size.height *.75 : double.infinity,),
|
||||
decoration: const BoxDecoration(
|
||||
color: Colors.white,
|
||||
borderRadius: BorderRadius.only(
|
||||
topRight: Radius.circular(25),
|
||||
topLeft: Radius.circular(25),
|
||||
),
|
||||
),
|
||||
padding: MediaQuery.of(context).viewInsets,
|
||||
clipBehavior: Clip.antiAlias,
|
||||
child:SingleChildScrollView(child: Column(
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: <Widget>[
|
||||
mHeight(13),
|
||||
Container(
|
||||
height: 6,
|
||||
width: 60,
|
||||
decoration: const BoxDecoration(
|
||||
color: Color(0xff9A9A9A),
|
||||
borderRadius: BorderRadius.all(
|
||||
Radius.circular(20),
|
||||
),
|
||||
),
|
||||
),
|
||||
mHeight(8),
|
||||
child,
|
||||
],
|
||||
)),
|
||||
);
|
||||
},
|
||||
).then((value) {
|
||||
// print("BACK FROM DELEGATE!!!!");
|
||||
// print("value: $value");
|
||||
if (value == "delegate_reload") {
|
||||
callBackFunc();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
class BottomSheetItem extends StatelessWidget {
|
||||
final Function onTap;
|
||||
final IconData icon;
|
||||
final String title;
|
||||
final Color color;
|
||||
|
||||
const BottomSheetItem({Key? key, required this.onTap, required this.title, required this.icon, this.color = Colors.black}) : super(key: key);
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return InkWell(
|
||||
onTap: () {
|
||||
if (onTap != null) {
|
||||
Navigator.pop(context);
|
||||
onTap();
|
||||
}
|
||||
},
|
||||
child: Padding(
|
||||
padding: EdgeInsets.symmetric(horizontal: 18.0, vertical: 18.0),
|
||||
child: Row(
|
||||
children: <Widget>[
|
||||
if (icon != null)
|
||||
Icon(
|
||||
icon,
|
||||
color: color,
|
||||
size: 18.0,
|
||||
),
|
||||
if (icon != null) SizedBox(width: 24.0),
|
||||
Text(
|
||||
title ?? "",
|
||||
style: TextStyle(color: color),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue