Haroon6138
/
diplomatic-quarter
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

updates & fixes

Browse Source
merge-requests/404/head
haroon amjad 3 years ago
parent 184942e891
commit a4a2389a78
8 changed files with 55 additions and 33 deletions
Show Stats Download Patch File Download Diff File

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

@ -132,6 +132,9 @@ class BaseAppClient {
if (parsed['ErrorType'] == 4) { if (parsed['ErrorType'] == 4) {
navigateToAppUpdate(AppGlobal.context, parsed['ErrorEndUserMessage']); navigateToAppUpdate(AppGlobal.context, parsed['ErrorEndUserMessage']);
} }
if (parsed['ErrorType'] == 2) {
await logout();
}
if (isAllowAny) { if (isAllowAny) {
onSuccess(parsed, statusCode); onSuccess(parsed, statusCode);
} else if (parsed['IsAuthenticated'] == null) { } else if (parsed['IsAuthenticated'] == null) {
@ -165,11 +168,11 @@ class BaseAppClient {
onFailure(parsed['message'] ?? parsed['ErrorEndUserMessage'] ?? parsed['ErrorMessage'], statusCode); onFailure(parsed['message'] ?? parsed['ErrorEndUserMessage'] ?? parsed['ErrorMessage'], statusCode);
} }
} }
} else if (!parsed['IsAuthenticated']) { }
await logout(); // else if (!parsed['IsAuthenticated']) {
// await logout();
//helpers.showErrorToast('Your session expired Please login agian'); // }
} else { else {
if (parsed['SameClinicApptList'] != null) { if (parsed['SameClinicApptList'] != null) {
onSuccess(parsed, statusCode); onSuccess(parsed, statusCode);
} else { } else {

18
lib/core/service/insurance_service.dart
Unescape Escape View File

@ -10,6 +10,8 @@ import 'package:diplomaticquarterapp/models/FamilyFiles/GetAllSharedRecordByStat
import 'package:diplomaticquarterapp/models/FamilyFiles/GetAllSharedRecordsByStatusReq.dart'; import 'package:diplomaticquarterapp/models/FamilyFiles/GetAllSharedRecordsByStatusReq.dart';
import 'package:diplomaticquarterapp/services/family_files/family_files_provider.dart'; import 'package:diplomaticquarterapp/services/family_files/family_files_provider.dart';
import 'package:diplomaticquarterapp/uitl/app_toast.dart'; import 'package:diplomaticquarterapp/uitl/app_toast.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:flutter/material.dart';
class InsuranceCardService extends BaseService { class InsuranceCardService extends BaseService {
List<InsuranceCardModel> _cardList = List(); List<InsuranceCardModel> _cardList = List();
@ -161,7 +163,7 @@ class InsuranceCardService extends BaseService {
); );
} }
Future uploadInsuranceCard({String patientIdentificationID, int patientID, String image = ""}) async { Future uploadInsuranceCard(BuildContext context, {String patientIdentificationID, int patientID, String image = ""}) async {
error = ""; error = "";
Map<String, dynamic> body = Map(); Map<String, dynamic> body = Map();
body['PatientID'] = patientID; body['PatientID'] = patientID;
@ -170,14 +172,26 @@ class InsuranceCardService extends BaseService {
body['PatientIdentificationID'] = patientIdentificationID; body['PatientIdentificationID'] = patientIdentificationID;
body['InsuranceCardImage'] = image; body['InsuranceCardImage'] = image;
dynamic localRes;
await baseAppClient.post( await baseAppClient.post(
UPLOAD_INSURANCE_CARD, UPLOAD_INSURANCE_CARD,
onSuccess: (dynamic response, int statusCode) {}, onSuccess: (dynamic response, int statusCode) {
print(response);
if(response['MessageStatus'] == 1) {
AppToast.showSuccessToast(message: TranslationBase.of(context).requestSent);
} else {
AppToast.showErrorToast(message: response['ErrorEndUserMessage']);
}
localRes = response;
},
onFailure: (String error, int statusCode) { onFailure: (String error, int statusCode) {
hasError = true; hasError = true;
super.error = error; super.error = error;
throw error;
}, },
body: body, body: body,
); );
return Future.value(localRes);
} }
} }

4
lib/core/service/medical/ActiveMedicationsService.dart
Unescape Escape View File

@ -10,8 +10,8 @@ class ActiveMedicationsService extends BaseService{
hasError = false; hasError = false;
super.error = ""; super.error = "";
Map<String, dynamic> body = Map(); Map<String, dynamic> body = Map();
body['isDentalAllowedBackend'] = false; // body['isDentalAllowedBackend'] = false;
body['PatientID'] = 1298851; // body['PatientID'] = 1298851;
await baseAppClient.post(ADD_ACTIVE_PRESCRIPTIONS_REPORT_BY_PATIENT_ID, await baseAppClient.post(ADD_ACTIVE_PRESCRIPTIONS_REPORT_BY_PATIENT_ID,
onSuccess: (response, statusCode) async { onSuccess: (response, statusCode) async {
activePrescriptionReport.clear(); activePrescriptionReport.clear();

5
lib/core/viewModels/insurance_card_View_model.dart
Unescape Escape View File

@ -4,6 +4,7 @@ import 'package:diplomaticquarterapp/core/model/insurance/insurance_card.dart';
import 'package:diplomaticquarterapp/core/model/insurance/insurance_card_update_model.dart'; import 'package:diplomaticquarterapp/core/model/insurance/insurance_card_update_model.dart';
import 'package:diplomaticquarterapp/core/service/insurance_service.dart'; import 'package:diplomaticquarterapp/core/service/insurance_service.dart';
import 'package:diplomaticquarterapp/models/FamilyFiles/GetAllSharedRecordByStatusResponse.dart'; import 'package:diplomaticquarterapp/models/FamilyFiles/GetAllSharedRecordByStatusResponse.dart';
import 'package:flutter/material.dart';
import '../../locator.dart'; import '../../locator.dart';
import 'base_view_model.dart'; import 'base_view_model.dart';
@ -72,9 +73,9 @@ class InsuranceViewModel extends BaseViewModel {
} else } else
setState(ViewState.Idle); setState(ViewState.Idle);
} }
Future uploadInsuranceCard({String patientIdentificationID, int patientID,String image =""}) async { Future uploadInsuranceCard(BuildContext context, {String patientIdentificationID, int patientID,String image =""}) async {
setState(ViewState.BusyLocal); setState(ViewState.BusyLocal);
await _insuranceCardService.uploadInsuranceCard(patientIdentificationID: patientIdentificationID,patientID: patientID,image: image); await _insuranceCardService.uploadInsuranceCard(context, patientIdentificationID: patientIdentificationID,patientID: patientID,image: image);
if (_insuranceCardService.hasError) { if (_insuranceCardService.hasError) {
error = _insuranceCardService.error; error = _insuranceCardService.error;
setState(ViewState.ErrorLocal); setState(ViewState.ErrorLocal);

18
lib/pages/insurance/insurance_card_update_details.dart
Unescape Escape View File

@ -316,13 +316,15 @@ class InsuranceCardUpdateDetails extends StatelessWidget {
color: CustomColors.accentColor, color: CustomColors.accentColor,
onTap: () async { onTap: () async {
GifLoaderDialogUtils.showMyDialog(context); GifLoaderDialogUtils.showMyDialog(context);
await model.uploadInsuranceCard(patientIdentificationID: patientIdentificationID, patientID: patientID); model.uploadInsuranceCard(context, patientIdentificationID: patientIdentificationID, patientID: patientID).then((res) {
GifLoaderDialogUtils.hideDialog(context); print(res);
if (model.state == ViewState.ErrorLocal) { GifLoaderDialogUtils.hideDialog(context);
AppToast.showErrorToast(message: model.error); }).catchError((err) {
} else { GifLoaderDialogUtils.hideDialog(context);
AppToast.showSuccessToast(message: TranslationBase.of(context).requestSent); AppToast.showErrorToast(message: err.toString());
} print(err);
});
}, },
), ),
if (insuranceCardDetailsModel.isNotEmpty) if (insuranceCardDetailsModel.isNotEmpty)
@ -408,7 +410,7 @@ class InsuranceCardUpdateDetails extends StatelessWidget {
name: name, name: name,
image: (file, image) async { image: (file, image) async {
GifLoaderDialogUtils.showMyDialog(context); GifLoaderDialogUtils.showMyDialog(context);
await model.uploadInsuranceCard(patientIdentificationID: patientIdentificationID, patientID: patientID, image: image); await model.uploadInsuranceCard(context, patientIdentificationID: patientIdentificationID, patientID: patientID, image: image);
GifLoaderDialogUtils.hideDialog(context); GifLoaderDialogUtils.hideDialog(context);
if (model.state == ViewState.ErrorLocal || model.state == ViewState.Error) { if (model.state == ViewState.ErrorLocal || model.state == ViewState.Error) {
AppToast.showErrorToast(message: model.error); AppToast.showErrorToast(message: model.error);

20
lib/pages/livecare/widgets/clinic_list.dart
Unescape Escape View File

@ -252,7 +252,9 @@ class _clinic_listState extends State<ClinicList> {
}); });
} }
Navigator.push(context, FadePage(page: PaymentMethod())).then((value) { Navigator.push(context, FadePage(page: PaymentMethod(onSelectedMethod: (String metohd) {
setState(() {});
}))).then((value) {
print(value); print(value);
if (value != null) { if (value != null) {
openPayment(value, authUser, double.parse(getERAppointmentFeesList.total), appo); openPayment(value, authUser, double.parse(getERAppointmentFeesList.total), appo);
@ -485,7 +487,7 @@ class _clinic_listState extends State<ClinicList> {
disabledTextColor: Colors.white, disabledTextColor: Colors.white,
disabledColor: new Color(0xFFbcc2c4), disabledColor: new Color(0xFFbcc2c4),
onPressed: startScheduleLiveCare, onPressed: startScheduleLiveCare,
child: Text("Start", style: TextStyle(fontSize: 18.0)), child: Text(TranslationBase.of(context).start, style: TextStyle(fontSize: 18.0)),
), ),
), ),
), ),
@ -500,7 +502,7 @@ class _clinic_listState extends State<ClinicList> {
children: <Widget>[ children: <Widget>[
isDataLoaded isDataLoaded
? Container( ? Container(
height: MediaQuery.of(context).size.height * 0.8, height: MediaQuery.of(context).size.height * 0.75,
child: SingleChildScrollView( child: SingleChildScrollView(
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
@ -558,17 +560,13 @@ class _clinic_listState extends State<ClinicList> {
? Align( ? Align(
alignment: FractionalOffset.bottomCenter, alignment: FractionalOffset.bottomCenter,
child: Container( child: Container(
margin: EdgeInsets.fromLTRB(20.0, 0.0, 20.0, 0.0),
color: Colors.grey[100], color: Colors.grey[100],
transform: Matrix4.translationValues(0.0, -65.0, 0.0),
width: MediaQuery.of(context).size.width, width: MediaQuery.of(context).size.width,
height: 50.0, height: 50.0,
margin: EdgeInsets.fromLTRB(0.0, 10.0, 0.0, 20.0), child: DefaultButton(TranslationBase.of(context).start, () {
child: Container( startLiveCare();
margin: EdgeInsets.fromLTRB(20.0, 0.0, 20.0, 0.0), }),
child: DefaultButton(TranslationBase.of(context).start, () {
startLiveCare();
}),
),
), ),
) )
: Container(), : Container(),

6
lib/pages/medical/balance/advance_payment_page.dart
Unescape Escape View File

@ -298,7 +298,11 @@ class _AdvancePaymentPageState extends State<AdvancePaymentPage> {
GifLoaderDialogUtils.hideDialog(context); GifLoaderDialogUtils.hideDialog(context);
if (model.state != ViewState.Error && model.state != ViewState.ErrorLocal) { if (model.state != ViewState.Error && model.state != ViewState.ErrorLocal) {
Utils.hideKeyboard(context); Utils.hideKeyboard(context);
Navigator.push(context, FadePage(page: PaymentMethod())).then( Navigator.push(context, FadePage(page: PaymentMethod(
onSelectedMethod: (String metohd) {
setState(() {});
}
))).then(
(value) { (value) {
Navigator.push( Navigator.push(
context, context,

4
lib/widgets/data_display/medical/LabResult/LineChartCurved.dart
Unescape Escape View File

@ -152,7 +152,7 @@ class LineChartCurvedState extends State<LineChartCurved> {
print(e); print(e);
} }
}); });
print("MinX: " + max.roundToDouble().toString());
return max.roundToDouble(); return max.roundToDouble();
} }
@ -169,7 +169,7 @@ class LineChartCurvedState extends State<LineChartCurved> {
print(e); print(e);
} }
int value = min.toInt(); int value = min.toInt();
print("MinY: " + value.toDouble().toString());
return value.toDouble(); return value.toDouble();
} }

Write Preview
Loading…
Cancel
Save