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

fixes

Browse Source
dev_v3.13.6_voipcall
Sultan khan 9 months ago
parent 735582e3ab
commit 001417f9b3
9 changed files with 72 additions and 64 deletions
Show Stats Download Patch File Download Diff File

5
lib/core/viewModels/er/am_request_view_model.dart
Unescape Escape View File

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

4
lib/pages/Covid-DriveThru/Covid-TimeSlots.dart
Unescape Escape View File

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

2
lib/pages/Covid-DriveThru/covid-payment-summary.dart
Unescape Escape View File

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

1
lib/pages/ErService/AmbulanceReq.dart
Unescape Escape View File

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

5
lib/pages/ErService/AmbulanceRequestIndexPages/AmbulanceRequestIndex.dart
Unescape Escape View File

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

9
lib/pages/ErService/AmbulanceRequestIndexPages/Summary.dart
Unescape Escape View File

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

2
lib/pages/medical/reports/monthly_reports.dart
Unescape Escape View File

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

100
lib/pages/settings/general_setting.dart
Unescape Escape View File

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

8
lib/services/appointment_services/GetDoctorsList.dart
Unescape Escape View File

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

Write Preview
Loading…
Cancel
Save