merge-update-with-lab-changes
Sultan khan 2 years ago
parent 735582e3ab
commit 001417f9b3

@ -64,7 +64,7 @@ class AmRequestViewModel extends BaseViewModel {
setState(ViewState.Error); setState(ViewState.Error);
} else } else
// getPatientAllPresOrdersList(); // getPatientAllPresOrdersList();
getPatientAllPresOrdersListRC(); await getPatientAllPresOrdersListRC();
} }
Future getPatientAllPresOrdersListRC() async { Future getPatientAllPresOrdersListRC() async {
@ -118,6 +118,7 @@ class AmRequestViewModel extends BaseViewModel {
setState(ViewState.ErrorLocal); setState(ViewState.ErrorLocal);
} else } else
// getAmRequestOrders(); // getAmRequestOrders();
getPatientAllPresOrdersListRC();
await getPatientAllPresOrdersListRC();
} }
} }

@ -500,8 +500,8 @@ class _CovidTimeSlotsState extends State<CovidTimeSlots> with TickerProviderStat
DoctorsListService service = new DoctorsListService(); DoctorsListService service = new DoctorsListService();
service.getPatientShare(appointmentNo, clinicID, projectID, languageID, context).then((res) { service.getPatientShare(appointmentNo, clinicID, projectID, languageID, context).then((res) {
GifLoaderDialogUtils.hideDialog(context); GifLoaderDialogUtils.hideDialog(context);
print(res); res = res['OnlineCheckInAppointments'][0];
widget.patientShareResponse = new PatientShareResponse.fromJson(res); widget.patientShareResponse = PatientShareResponse.fromJson(res);
updateCovidQuestionnaire(context, appointmentNo); updateCovidQuestionnaire(context, appointmentNo);
navigateToPaymentAlert(); navigateToPaymentAlert();
}).catchError((err) { }).catchError((err) {

@ -1,5 +1,6 @@
import 'dart:io'; import 'dart:io';
import 'package:diplomaticquarterapp/config/config.dart';
import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
import 'package:diplomaticquarterapp/models/Appointments/AppoimentAllHistoryResultList.dart'; import 'package:diplomaticquarterapp/models/Appointments/AppoimentAllHistoryResultList.dart';
import 'package:diplomaticquarterapp/models/Appointments/PatientShareResposne.dart'; import 'package:diplomaticquarterapp/models/Appointments/PatientShareResposne.dart';
@ -231,6 +232,7 @@ class _CovidPaymentSummaryState extends State<CovidPaymentSummary> {
widget.patientShareResponse!.isLiveCareAppointment!, widget.patientShareResponse!.isLiveCareAppointment!,
"2", "2",
"", "",
AppGlobal.context,
widget.patientShareResponse!.appointmentDate, widget.patientShareResponse!.appointmentDate,
widget.patientShareResponse!.appointmentNo!, widget.patientShareResponse!.appointmentNo!,
widget.patientShareResponse!.clinicID!, widget.patientShareResponse!.clinicID!,

@ -83,6 +83,7 @@ class _AmbulanceReqState extends State<AmbulanceReq> with SingleTickerProviderSt
children: <Widget>[ children: <Widget>[
AmbulanceRequestIndexPage( AmbulanceRequestIndexPage(
amRequestViewModel: model, amRequestViewModel: model,
tabController: _tabController,
), ),
OrderLogPage( OrderLogPage(
amRequestViewModel: model, amRequestViewModel: model,

@ -24,8 +24,8 @@ import 'Summary.dart';
class AmbulanceRequestIndexPage extends StatefulWidget { class AmbulanceRequestIndexPage extends StatefulWidget {
final AmRequestViewModel amRequestViewModel; final AmRequestViewModel amRequestViewModel;
final TabController tabController;
AmbulanceRequestIndexPage({Key? key, required this.amRequestViewModel}); AmbulanceRequestIndexPage({Key? key, required this.amRequestViewModel, required this.tabController});
@override @override
_AmbulanceRequestIndexPageState createState() => _AmbulanceRequestIndexPageState(); _AmbulanceRequestIndexPageState createState() => _AmbulanceRequestIndexPageState();
@ -363,6 +363,7 @@ class _AmbulanceRequestIndexPageState extends State<AmbulanceRequestIndexPage> {
patientER: _patientER, patientER: _patientER,
patientER_RC: _patientER_RC, patientER_RC: _patientER_RC,
amRequestViewModel: widget.amRequestViewModel, amRequestViewModel: widget.amRequestViewModel,
tabController: widget.tabController,
), ),
], ],
), ),

@ -11,18 +11,19 @@ import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
class Summary extends StatefulWidget { class Summary extends StatefulWidget {
final Function changeCurrentTab; final Function(int)? changeCurrentTab;
final PatientER patientER; final PatientER patientER;
final PatientER_RC patientER_RC; final PatientER_RC patientER_RC;
final AmRequestViewModel amRequestViewModel; final AmRequestViewModel amRequestViewModel;
final TabController tabController;
Summary({Key? key, required this.changeCurrentTab, required this.patientER, required this.patientER_RC, required this.amRequestViewModel}); Summary({Key? key, required this.changeCurrentTab, required this.patientER, required this.patientER_RC, required this.amRequestViewModel, required this.tabController});
@override @override
_SummaryState createState() => _SummaryState(); _SummaryState createState() => _SummaryState();
} }
class _SummaryState extends State<Summary> { class _SummaryState extends State<Summary> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
ProjectViewModel projectViewModel = Provider.of(context); ProjectViewModel projectViewModel = Provider.of(context);
@ -137,6 +138,8 @@ class _SummaryState extends State<Summary> {
padding: EdgeInsets.all(12.0), padding: EdgeInsets.all(12.0),
child: DefaultButton(TranslationBase.of(context).send, () async { child: DefaultButton(TranslationBase.of(context).send, () async {
await widget.amRequestViewModel.insertERPressOrder(patientER: widget.patientER_RC); await widget.amRequestViewModel.insertERPressOrder(patientER: widget.patientER_RC);
widget.tabController.animateTo(1);
}), }),
), ),
); );

@ -143,7 +143,7 @@ class _MonthlyReportsPageState extends State<MonthlyReportsPage> {
), ),
TextFormField( TextFormField(
scrollPadding: EdgeInsets.zero, scrollPadding: EdgeInsets.zero,
keyboardType: TextInputType.number, keyboardType: TextInputType.emailAddress,
// controller: _controller, // controller: _controller,
onChanged: (value) => {email = value}, onChanged: (value) => {email = value},
initialValue: email, initialValue: email,

@ -45,56 +45,56 @@ class _GeneralSettings extends State<GeneralSettings> with TickerProviderStateMi
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Text( // Text(
TranslationBase.of(context).modes, // TranslationBase.of(context).modes,
style: TextStyle( // style: TextStyle(
fontSize: 16, // fontSize: 16,
fontWeight: FontWeight.w600, // fontWeight: FontWeight.w600,
letterSpacing: -0.64, // letterSpacing: -0.64,
), // ),
), // ),
Row( // Row(
children: [ // children: [
Checkbox( // Checkbox(
value: vibration, // value: vibration,
onChanged: (value) { // onChanged: (value) {
setState(() { // setState(() {
vibration = value!; // vibration = value!;
}); // });
}, // },
activeColor: CustomColors.accentColor, // activeColor: CustomColors.accentColor,
), // ),
Text( // Text(
TranslationBase.of(context).vibration, // TranslationBase.of(context).vibration,
style: TextStyle( // style: TextStyle(
fontSize: 12, // fontSize: 12,
letterSpacing: -0.48, // letterSpacing: -0.48,
), // ),
), // ),
], // ],
), // ),
Row( // Row(
children: [ // children: [
Checkbox( // Checkbox(
value: accsibility, // value: accsibility,
onChanged: (value) { // onChanged: (value) {
setState(() { // setState(() {
accsibility = value!; // accsibility = value!;
}); // });
}, // },
activeColor: CustomColors.accentColor, // activeColor: CustomColors.accentColor,
), // ),
Text( // Text(
TranslationBase.of(context).accessibility, // TranslationBase.of(context).accessibility,
style: TextStyle( // style: TextStyle(
fontSize: 12, // fontSize: 12,
letterSpacing: -0.48, // letterSpacing: -0.48,
), // ),
), // ),
], // ],
), // ),
mHeight(16), // mHeight(16),
mHeight(12), // mHeight(12),
Text( Text(
TranslationBase.of(context).blindMode, TranslationBase.of(context).blindMode,
style: TextStyle( style: TextStyle(

@ -28,10 +28,10 @@ class DoctorsListService extends BaseService {
AuthenticatedUser authUser = new AuthenticatedUser(); AuthenticatedUser authUser = new AuthenticatedUser();
AuthProvider authProvider = new AuthProvider(); AuthProvider authProvider = new AuthProvider();
late double lat; double? lat;
late double long; double? long;
late String deviceToken; String? deviceToken;
late String tokenID; String? tokenID;
List<LaserBodyPart> selectedBodyPartList = []; List<LaserBodyPart> selectedBodyPartList = [];
Future<Map> getDoctorsList(int clinicID, int projectID, bool isNearest, int languageID, BuildContext context, {doctorId, doctorName, isContinueDentalPlan = false}) async { Future<Map> getDoctorsList(int clinicID, int projectID, bool isNearest, int languageID, BuildContext context, {doctorId, doctorName, isContinueDentalPlan = false}) async {

Loading…
Cancel
Save