Compare commits
9 Commits
dev_v3.13.
...
dev_3.13.6
| Author | SHA1 | Date |
|---|---|---|
 haroon amjad
|
5e8fe20f52 | 1 year ago |
|
haroon amjad
|
11a43eb0ae | 1 year ago |
|
haroon amjad
|
0eaeb75207 | 1 year ago |
|
haroon amjad
|
82e933a06f | 1 year ago |
|
haroon amjad
|
1b545c4d0b | 1 year ago |
|
haroon amjad
|
ca8533190a | 1 year ago |
|
haroon amjad
|
d65325f998 | 1 year ago |
|
haroon amjad
|
984459d314 | 1 year ago |
|
haroon amjad
|
b3f2904e9a | 1 year ago |
Binary file not shown.
|
After Width: | Height: | Size: 432 KiB |
@ -1,7 +1,7 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="21.035" height="25.699" viewBox="0 0 21.035 25.699">
|
||||
<g id="file_4_" data-name="file (4)" transform="translate(0 0)">
|
||||
<path id="Path_4376" data-name="Path 4376" d="M199.117,108.4h.751v18.461a2.228,2.228,0,0,0,2.225,2.225h13.668v.684a1.42,1.42,0,0,1-1.42,1.42H199.12a1.42,1.42,0,0,1-1.42-1.42V109.82A1.418,1.418,0,0,1,199.117,108.4Z" transform="translate(-197.7 -105.491)" fill="#00000"/>
|
||||
<path id="Path_4377" data-name="Path 4377" d="M95.931,22.79H88.32a1.42,1.42,0,0,1-1.42-1.42V1.42A1.42,1.42,0,0,1,88.32,0H98.462V.47a1.378,1.378,0,0,0-.008.15V4.509a2,2,0,0,0,2,2h3.889c.04,0,.083,0,.123-.005h.494V21.371a1.42,1.42,0,0,1-1.42,1.42H95.931Zm-.287-4.825h4.962a.671.671,0,0,0,0-1.342H95.641a.671.671,0,1,0,0,1.342Zm-4.965-3.424h9.927a.671.671,0,0,0,0-1.342H90.679a.671.671,0,0,0,0,1.342Zm9.927-4.978H90.679a.671.671,0,0,0,0,1.342h9.927a.671.671,0,0,0,0-1.342Z" transform="translate(-83.924 0)" fill="#00000"/>
|
||||
<path id="Path_4378" data-name="Path 4378" d="M92.626,6.481h-3.9A1.191,1.191,0,0,1,87.546,5.3V1.4a.6.6,0,0,1,.6-.6.582.582,0,0,1,.419.177L93.05,5.462A.6.6,0,0,1,92.626,6.481Z" transform="translate(-72.209 -0.779)" fill="#00000"/>
|
||||
<path id="Path_4376" data-name="Path 4376" d="M199.117,108.4h.751v18.461a2.228,2.228,0,0,0,2.225,2.225h13.668v.684a1.42,1.42,0,0,1-1.42,1.42H199.12a1.42,1.42,0,0,1-1.42-1.42V109.82A1.418,1.418,0,0,1,199.117,108.4Z" transform="translate(-197.7 -105.491)" fill="#989898"/>
|
||||
<path id="Path_4377" data-name="Path 4377" d="M95.931,22.79H88.32a1.42,1.42,0,0,1-1.42-1.42V1.42A1.42,1.42,0,0,1,88.32,0H98.462V.47a1.378,1.378,0,0,0-.008.15V4.509a2,2,0,0,0,2,2h3.889c.04,0,.083,0,.123-.005h.494V21.371a1.42,1.42,0,0,1-1.42,1.42H95.931Zm-.287-4.825h4.962a.671.671,0,0,0,0-1.342H95.641a.671.671,0,1,0,0,1.342Zm-4.965-3.424h9.927a.671.671,0,0,0,0-1.342H90.679a.671.671,0,0,0,0,1.342Zm9.927-4.978H90.679a.671.671,0,0,0,0,1.342h9.927a.671.671,0,0,0,0-1.342Z" transform="translate(-83.924 0)" fill="#989898"/>
|
||||
<path id="Path_4378" data-name="Path 4378" d="M92.626,6.481h-3.9A1.191,1.191,0,0,1,87.546,5.3V1.4a.6.6,0,0,1,.6-.6.582.582,0,0,1,.419.177L93.05,5.462A.6.6,0,0,1,92.626,6.481Z" transform="translate(-72.209 -0.779)" fill="#989898"/>
|
||||
</g>
|
||||
</svg>
|
||||
|
||||
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.2 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 33 KiB |
@ -1,6 +1,5 @@
|
||||
import 'package:diplomaticquarterapp/theme/theme_value.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
final Color? secondaryColor = appColor;
|
||||
final Color? secondaryColor = Colors.red[800];
|
||||
|
||||
final Color? dividerColor = Colors.grey[600];
|
||||
@ -0,0 +1,113 @@
|
||||
import 'package:diplomaticquarterapp/pages/BookAppointment/waiting_appointment/waiting_appointment_verification.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/buttons/defaultButton.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_svg/flutter_svg.dart';
|
||||
|
||||
class WaitingAppointmentInfo extends StatelessWidget {
|
||||
const WaitingAppointmentInfo({super.key});
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return AppScaffold(
|
||||
appBarTitle: TranslationBase.of(context).waitingAppointment,
|
||||
isShowAppBar: true,
|
||||
isShowDecPage: false,
|
||||
showNewAppBar: true,
|
||||
showNewAppBarTitle: true,
|
||||
backgroundColor: CustomColors.appBackgroudGreyColor,
|
||||
body: SingleChildScrollView(
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.all(16.0),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Container(
|
||||
width: MediaQuery.of(context).size.width,
|
||||
decoration: containerRadius(Colors.white, 10),
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.all(12.0),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
SvgPicture.asset(
|
||||
"assets/images/new/waitingAppo.svg",
|
||||
width: 52.0,
|
||||
height: 52.0,
|
||||
),
|
||||
mHeight(11),
|
||||
Text(
|
||||
TranslationBase.of(context).whatWaitingAppointment,
|
||||
maxLines: 1,
|
||||
style: TextStyle(fontSize: 17, fontWeight: FontWeight.w700, color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
|
||||
),
|
||||
mHeight(11),
|
||||
Container(
|
||||
width: MediaQuery.of(context).size.width * 0.8,
|
||||
child: Text(
|
||||
TranslationBase.of(context).waitingAppointmentText1,
|
||||
style: TextStyle(fontSize: 14, color: CustomColors.textDarkColor, letterSpacing: -1.04, height: 35 / 24, overflow: TextOverflow.clip),
|
||||
),
|
||||
),
|
||||
mHeight(18),
|
||||
Container(
|
||||
width: MediaQuery.of(context).size.width * 0.8,
|
||||
child: Text(
|
||||
TranslationBase.of(context).waitingAppointmentText2,
|
||||
style: TextStyle(fontSize: 14, color: CustomColors.textDarkColor, letterSpacing: -1.04, height: 35 / 24, overflow: TextOverflow.clip),
|
||||
),
|
||||
),
|
||||
mHeight(24),
|
||||
Row(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Icon(
|
||||
Icons.warning,
|
||||
size: 20,
|
||||
color: Color(0xffA78618),
|
||||
),
|
||||
mWidth(10),
|
||||
Container(
|
||||
width: MediaQuery.of(context).size.width * 0.7,
|
||||
child: Text(
|
||||
TranslationBase.of(context).waitingAppointmentText3,
|
||||
style: TextStyle(
|
||||
fontSize: 14, fontStyle: FontStyle.italic, fontWeight: FontWeight.w600, color: Color(0xffA78618), letterSpacing: -1.04, height: 35 / 24, overflow: TextOverflow.clip),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
bottomSheet: Container(
|
||||
height: 80,
|
||||
color: CustomColors.white,
|
||||
padding: EdgeInsets.fromLTRB(12.0, 12.0, 12.0, 25.0),
|
||||
child: Container(
|
||||
child: DefaultButton(
|
||||
TranslationBase.of(context).continues,
|
||||
() {
|
||||
Navigator.push(
|
||||
context,
|
||||
FadePage(
|
||||
page: WaitingAppointmentVerification(),
|
||||
),
|
||||
);
|
||||
},
|
||||
color: CustomColors.accentColor,
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,292 @@
|
||||
import 'package:barcode_scan2/barcode_scan2.dart';
|
||||
import 'package:diplomaticquarterapp/core/model/privilege/ProjectDetailListModel.dart';
|
||||
import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
|
||||
import 'package:diplomaticquarterapp/pages/BookAppointment/BookConfirm.dart';
|
||||
import 'package:diplomaticquarterapp/services/appointment_services/GetDoctorsList.dart';
|
||||
import 'package:diplomaticquarterapp/theme/colors.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_new.dart';
|
||||
import 'package:diplomaticquarterapp/widgets/buttons/defaultButton.dart';
|
||||
import 'package:diplomaticquarterapp/widgets/nfc/nfc_reader_sheet.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_svg/flutter_svg.dart';
|
||||
import 'package:intl/intl.dart';
|
||||
import 'package:provider/provider.dart';
|
||||
|
||||
import '../../../uitl/utils.dart';
|
||||
|
||||
class WaitingAppointmentVerification extends StatefulWidget {
|
||||
const WaitingAppointmentVerification({super.key});
|
||||
|
||||
@override
|
||||
State<WaitingAppointmentVerification> createState() => _WaitingAppointmentVerificationState();
|
||||
}
|
||||
|
||||
class _WaitingAppointmentVerificationState extends State<WaitingAppointmentVerification> {
|
||||
String selectedVerificationMethod = "QR";
|
||||
|
||||
late ProjectViewModel projectViewModel;
|
||||
late LocationUtils locationUtils;
|
||||
ProjectDetailListModel projectDetailListModel = ProjectDetailListModel();
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
projectViewModel = Provider.of(context);
|
||||
return AppScaffold(
|
||||
appBarTitle: TranslationBase.of(context).waitingAppointment,
|
||||
isShowAppBar: true,
|
||||
isShowDecPage: false,
|
||||
showNewAppBar: true,
|
||||
showNewAppBarTitle: true,
|
||||
backgroundColor: CustomColors.appBackgroudGreyColor,
|
||||
body: SingleChildScrollView(
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.all(16.0),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
mHeight(11),
|
||||
Text(
|
||||
TranslationBase.of(context).waitingAppointmentVerificationMethod,
|
||||
maxLines: 1,
|
||||
style: TextStyle(fontSize: 18, fontWeight: FontWeight.w700, color: Color(0xff2B353E), letterSpacing: -1.04, height: 35 / 24),
|
||||
),
|
||||
mHeight(12),
|
||||
Container(
|
||||
width: MediaQuery.of(context).size.width,
|
||||
decoration: containerRadius(Colors.white, 10),
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.fromLTRB(16.0, 0.0, 16.0, 0.0),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
InkWell(
|
||||
onTap: () {
|
||||
setState(() {
|
||||
selectedVerificationMethod = "QR";
|
||||
});
|
||||
},
|
||||
child: Row(
|
||||
children: [
|
||||
Container(
|
||||
width: 20,
|
||||
height: 20,
|
||||
decoration: containerColorRadiusBorderWidth(selectedVerificationMethod == "QR" ? CustomColors.accentColor : Colors.transparent, 100, Colors.grey, 0.5),
|
||||
),
|
||||
mWidth(6),
|
||||
Container(
|
||||
height: 40.0,
|
||||
width: 40.0,
|
||||
padding: EdgeInsets.all(7.0),
|
||||
child: SvgPicture.asset(
|
||||
"assets/images/new/services/qr_code.svg",
|
||||
),
|
||||
),
|
||||
Text(
|
||||
TranslationBase.of(context).pharmaLiveCareScanQR,
|
||||
style: TextStyle(fontSize: 14, color: CustomColors.textDarkColor, fontWeight: FontWeight.w600, letterSpacing: -1.04, height: 35 / 24, overflow: TextOverflow.clip),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
Divider(),
|
||||
InkWell(
|
||||
onTap: () {
|
||||
setState(() {
|
||||
selectedVerificationMethod = "NFC";
|
||||
});
|
||||
},
|
||||
child: Row(
|
||||
children: [
|
||||
Container(
|
||||
width: 20,
|
||||
height: 20,
|
||||
decoration: containerColorRadiusBorderWidth(selectedVerificationMethod == "NFC" ? CustomColors.accentColor : Colors.transparent, 100, Colors.grey, 0.5),
|
||||
),
|
||||
mWidth(6),
|
||||
Container(
|
||||
height: 40.0,
|
||||
width: 40.0,
|
||||
padding: EdgeInsets.all(7.0),
|
||||
child: SvgPicture.asset(
|
||||
"assets/images/new/services/contactless.svg",
|
||||
),
|
||||
),
|
||||
Text(
|
||||
TranslationBase.of(context).scanNFC,
|
||||
style: TextStyle(fontSize: 14, color: CustomColors.textDarkColor, fontWeight: FontWeight.w600, letterSpacing: -1.04, height: 35 / 24, overflow: TextOverflow.clip),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
Divider(),
|
||||
InkWell(
|
||||
onTap: () {
|
||||
setState(() {
|
||||
selectedVerificationMethod = "Location";
|
||||
});
|
||||
},
|
||||
child: Row(
|
||||
children: [
|
||||
Container(
|
||||
width: 20,
|
||||
height: 20,
|
||||
decoration: containerColorRadiusBorderWidth(selectedVerificationMethod == "Location" ? CustomColors.accentColor : Colors.transparent, 100, Colors.grey, 0.5),
|
||||
),
|
||||
mWidth(6),
|
||||
Container(
|
||||
height: 40.0,
|
||||
width: 40.0,
|
||||
padding: EdgeInsets.all(7.0),
|
||||
child: SvgPicture.asset(
|
||||
"assets/images/new/services/location.svg",
|
||||
),
|
||||
),
|
||||
Text(
|
||||
TranslationBase.of(context).checkInViaLocation,
|
||||
style: TextStyle(fontSize: 14, color: CustomColors.textDarkColor, fontWeight: FontWeight.w600, letterSpacing: -1.04, height: 35 / 24, overflow: TextOverflow.clip),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
mHeight(6),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
mHeight(12),
|
||||
Container(
|
||||
width: MediaQuery.of(context).size.width,
|
||||
decoration: containerRadius(Colors.white, 10),
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.fromLTRB(16.0, 0.0, 16.0, 0.0),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
mHeight(12),
|
||||
Text(
|
||||
TranslationBase.of(context).howToUseVerificationMethod,
|
||||
maxLines: 1,
|
||||
style: TextStyle(fontSize: 18, fontWeight: FontWeight.w600, color: Color(0xff2B353E), letterSpacing: -1.04, height: 35 / 24),
|
||||
),
|
||||
mHeight(12),
|
||||
Image.asset(
|
||||
'assets/images/new/NFCCheckIn_QR_gps_HMG.png',
|
||||
fit: BoxFit.fitWidth,
|
||||
width: MediaQuery.of(context).size.width,
|
||||
),
|
||||
mHeight(12),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
bottomSheet: Container(
|
||||
height: 80,
|
||||
color: CustomColors.white,
|
||||
padding: EdgeInsets.fromLTRB(12.0, 12.0, 12.0, 25.0),
|
||||
child: Container(
|
||||
child: DefaultButton(
|
||||
TranslationBase.of(context).continues,
|
||||
() {
|
||||
startVerification();
|
||||
},
|
||||
color: CustomColors.accentColor,
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
startVerification() {
|
||||
switch (selectedVerificationMethod) {
|
||||
case "QR":
|
||||
startQRCodeScan();
|
||||
break;
|
||||
case "NFC":
|
||||
startNFCScan();
|
||||
break;
|
||||
case "Location":
|
||||
startLocationCheckIn();
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
checkScannedNFCAndQRCode(String nfcId) {
|
||||
GifLoaderDialogUtils.showMyDialog(context);
|
||||
DoctorsListService service = new DoctorsListService();
|
||||
service.checkScannedNFCAndQRCode(nfcId, projectViewModel.waitingAppointmentDoctor!.projectID!).then((res) {
|
||||
GifLoaderDialogUtils.hideDialog(context);
|
||||
projectViewModel.setWaitingAppointmentNFCCode(nfcId);
|
||||
if (res["returnValue"] == 1) {
|
||||
navigateToBookConfirm(context);
|
||||
} else {
|
||||
AppToast.showErrorToast(message: "Invalid verification point scanned.");
|
||||
}
|
||||
}).catchError((err) {
|
||||
GifLoaderDialogUtils.hideDialog(context);
|
||||
print(err);
|
||||
});
|
||||
}
|
||||
|
||||
Future navigateToBookConfirm(context) async {
|
||||
final DateFormat formatter = DateFormat('yyyy-MM-dd');
|
||||
Navigator.push(
|
||||
context,
|
||||
FadePage(
|
||||
page: BookConfirm(
|
||||
doctor: projectViewModel.waitingAppointmentDoctor!,
|
||||
isLiveCareAppointment: false,
|
||||
selectedDate: formatter.format(DateTime.now()),
|
||||
selectedTime: TranslationBase.of(context).waitingAppointment,
|
||||
initialSlotDuration: 15,
|
||||
isWalkinAppointment: true,
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
startLocationCheckIn() async {
|
||||
locationUtils = new LocationUtils(isShowConfirmDialog: true, context: context);
|
||||
locationUtils.getCurrentLocation(callBack: (value) {
|
||||
projectDetailListModel = Utils.getProjectDetailObj(projectViewModel, projectViewModel.waitingAppointmentProjectID);
|
||||
double dist = Utils.distance(value.latitude, value.longitude, double.parse(projectDetailListModel.latitude!), double.parse(projectDetailListModel.longitude!)).ceilToDouble() * 1000;
|
||||
projectViewModel.setWaitingAppointmentNFCCode(projectDetailListModel.checkInQrCode!);
|
||||
print(dist);
|
||||
if (dist <= projectDetailListModel.geofenceRadius!) {
|
||||
navigateToBookConfirm(context);
|
||||
} else {
|
||||
AppToast.showErrorToast(message: TranslationBase.of(context).locationCheckInError);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
startNFCScan() {
|
||||
Future.delayed(const Duration(milliseconds: 500), () {
|
||||
showNfcReader(context, onNcfScan: (String nfcId) {
|
||||
Future.delayed(const Duration(milliseconds: 100), () {
|
||||
checkScannedNFCAndQRCode(nfcId);
|
||||
});
|
||||
}, onCancel: () {
|
||||
// Navigator.of(context).pop();
|
||||
// locator<GAnalytics>().todoList.to_do_list_nfc_cancel(widget.appointment!);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
startQRCodeScan() async {
|
||||
String onlineCheckInQRCode = (await BarcodeScanner.scan().then((value) => value.rawContent));
|
||||
if (onlineCheckInQRCode != "") {
|
||||
checkScannedNFCAndQRCode(onlineCheckInQRCode);
|
||||
} else {}
|
||||
}
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue