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

login issue

Browse Source
merge-requests/140/head
Sultan Khan 4 years ago
parent cced69502a
commit f05b235cd0
10 changed files with 86 additions and 70 deletions
Show Stats Download Patch File Download Diff File

7
lib/config/config.dart
Unescape Escape View File

@ -182,7 +182,8 @@ const CHECK_PAYMENT_STATUS =
//URL create advance payment //URL create advance payment
const CREATE_ADVANCE_PAYMENT = "Services/Doctors.svc/REST/CreateAdvancePayment"; const CREATE_ADVANCE_PAYMENT = "Services/Doctors.svc/REST/CreateAdvancePayment";
const HIS_CREATE_ADVANCE_PAYMENT = "Services/Patients.svc/REST/HIS_CreateAdvancePayment"; const HIS_CREATE_ADVANCE_PAYMENT =
"Services/Patients.svc/REST/HIS_CreateAdvancePayment";
const ADD_ADVANCE_NUMBER_REQUEST = const ADD_ADVANCE_NUMBER_REQUEST =
'Services/PayFort_Serv.svc/REST/AddAdvancedNumberRequest'; 'Services/PayFort_Serv.svc/REST/AddAdvancedNumberRequest';
@ -242,8 +243,8 @@ const LANGUAGE = 2;
const PATIENT_OUT_SA = 0; const PATIENT_OUT_SA = 0;
const SESSION_ID = 'TMRhVmkGhOsvamErw'; const SESSION_ID = 'TMRhVmkGhOsvamErw';
const IS_DENTAL_ALLOWED_BACKEND = false; const IS_DENTAL_ALLOWED_BACKEND = false;
const PATIENT_TYPE = 1; const PATIENT_TYPE = 2;
const PATIENT_TYPE_ID = 1; const PATIENT_TYPE_ID = 2;
var DEVICE_TOKEN = ""; var DEVICE_TOKEN = "";
var DeviceTypeID = Platform.isIOS ? 1 : 2; var DeviceTypeID = Platform.isIOS ? 1 : 2;
const LANGUAGE_ID = 2; const LANGUAGE_ID = 2;

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

@ -19,7 +19,9 @@ AppSharedPreferences sharedPref = new AppSharedPreferences();
/// onFailure: (String error, int statusCode) {}, /// onFailure: (String error, int statusCode) {},
/// body: Map(); /// body: Map();
/// ///
AuthenticatedUserObject authenticatedUserObject = locator<AuthenticatedUserObject>(); AuthenticatedUserObject authenticatedUserObject =
locator<AuthenticatedUserObject>();
class BaseAppClient { class BaseAppClient {
post(String endPoint, post(String endPoint,
{Map<String, dynamic> body, {Map<String, dynamic> body,
@ -66,21 +68,24 @@ class BaseAppClient {
body['PatientType'] = body.containsKey('PatientType') body['PatientType'] = body.containsKey('PatientType')
? body['PatientType'] != null ? body['PatientType'] != null
? body['PatientType'] ? body['PatientType']
: PATIENT_TYPE : user['PatientType'] != null
? user['PatientType']
: null
: PATIENT_TYPE; : PATIENT_TYPE;
body['PatientTypeID'] = body.containsKey('PatientTypeID') body['PatientTypeID'] = body.containsKey('PatientTypeID')
? body['PatientTypeID'] != null ? body['PatientTypeID'] != null
? body['PatientTypeID'] ? body['PatientTypeID']
: PATIENT_TYPE_ID : user['PatientTypeID'] != null
? user['PatientTypeID']
: null
: PATIENT_TYPE_ID; : PATIENT_TYPE_ID;
if (user != null) { if (user != null) {
body['TokenID'] = token; body['TokenID'] = token;
body['PatientID'] = body['PatientID'] =
body['PatientID'] != null ? body['PatientID'] : user['PatientID']; body['PatientID'] != null ? body['PatientID'] : user['PatientID'];
body['PatientOutSA'] = user['OutSA']; body['PatientOutSA'] = user['OutSA'];
body['SessionID'] = SESSION_ID;//getSessionId(token); body['SessionID'] = SESSION_ID; //getSessionId(token);
} }
} }
@ -117,12 +122,11 @@ class BaseAppClient {
onFailure( onFailure(
parsed['ErrorEndUserMessage'] ?? parsed['ErrorMessage'], parsed['ErrorEndUserMessage'] ?? parsed['ErrorMessage'],
statusCode); statusCode);
} }
} else if (parsed['MessageStatus'] == 1 || } else if (parsed['MessageStatus'] == 1 ||
parsed['SMSLoginRequired'] == true) { parsed['SMSLoginRequired'] == true) {
onSuccess(parsed, statusCode); onSuccess(parsed, statusCode);
}else if (!parsed['IsAuthenticated']) { } else if (!parsed['IsAuthenticated']) {
await logout(); await logout();
//helpers.showErrorToast('Your session expired Please login agian'); //helpers.showErrorToast('Your session expired Please login agian');

2
lib/models/Authentication/check_activation_code_request.dart
Unescape Escape View File

@ -2,7 +2,7 @@ class CheckActivationCodeReq {
int patientMobileNumber; int patientMobileNumber;
String mobileNo; String mobileNo;
String deviceToken; String deviceToken;
int projectOutSA; bool projectOutSA;
int loginType; int loginType;
String zipCode; String zipCode;
bool isRegister; bool isRegister;

2
lib/models/Authentication/send_activation_request.dart
Unescape Escape View File

@ -2,7 +2,7 @@ class SendActivationRequest {
int patientMobileNumber; int patientMobileNumber;
String mobileNo; String mobileNo;
String deviceToken; String deviceToken;
int projectOutSA; bool projectOutSA;
int loginType; int loginType;
String zipCode; String zipCode;
bool isRegister; bool isRegister;

2
lib/pages/BookAppointment/components/DocAvailableAppointments.dart
Unescape Escape View File

@ -235,7 +235,7 @@ class _DocAvailableAppointmentsState extends State<DocAvailableAppointments>
return children; return children;
}, },
), ),
onDaySelected: (date, events, holidays) { onDaySelected: (date, events) {
_onDaySelected(date, events); _onDaySelected(date, events);
_animationController.forward(from: 0.0); _animationController.forward(from: 0.0);
}, },

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

@ -348,7 +348,7 @@ class _CovidTimeSlotsState extends State<CovidTimeSlots>
return children; return children;
}, },
), ),
onDaySelected: (date, event, holidays) { onDaySelected: (date, event) {
_onDaySelected( _onDaySelected(
date, date,
event, event,

49
lib/pages/login/confirm-login.dart
Unescape Escape View File

@ -291,7 +291,9 @@ class _ConfirmLogin extends State<ConfirmLogin> {
checkUserAuthentication(type) { checkUserAuthentication(type) {
showLoader(true); showLoader(true);
var req = getCommonRequest(); var req = getCommonRequest(type: type);
req.logInTokenID = "";
var request = CheckPatientAuthenticationReq.fromJson(req.toJson()); var request = CheckPatientAuthenticationReq.fromJson(req.toJson());
GifLoaderDialogUtils.showMyDialog(context); GifLoaderDialogUtils.showMyDialog(context);
@ -317,12 +319,11 @@ class _ConfirmLogin extends State<ConfirmLogin> {
.catchError((err) { .catchError((err) {
print(err); print(err);
GifLoaderDialogUtils.hideDialog(context); GifLoaderDialogUtils.hideDialog(context);
}); });
} }
sendActivationCode(type) async { sendActivationCode(type) async {
var request = this.getCommonRequest(); var request = this.getCommonRequest(type: type);
GifLoaderDialogUtils.showMyDialog(context); GifLoaderDialogUtils.showMyDialog(context);
await this.authService.sendActivationCode(request).then((result) { await this.authService.sendActivationCode(request).then((result) {
GifLoaderDialogUtils.hideDialog(context); GifLoaderDialogUtils.hideDialog(context);
@ -353,10 +354,16 @@ class _ConfirmLogin extends State<ConfirmLogin> {
localizedReason: 'Scan your fingerprint to authenticate', localizedReason: 'Scan your fingerprint to authenticate',
useErrorDialogs: true, useErrorDialogs: true,
stickyAuth: true); stickyAuth: true);
print(authenticated);
if (authenticated == true) { if (authenticated == true) {
var request = this.getCommonRequest();
if(user.logInType==2 || user.logInType ==3){
this.checkActivationCode();
}else{
var request = this.getCommonRequest(type: type);
this.getMobileInfo(request); this.getMobileInfo(request);
}
} }
} }
} }
@ -445,30 +452,40 @@ class _ConfirmLogin extends State<ConfirmLogin> {
//this.cs.sharedService.getStorage(AuthenticationService.LAST_LOGIN); //this.cs.sharedService.getStorage(AuthenticationService.LAST_LOGIN);
} }
getCommonRequest() { getCommonRequest({type}) {
var request = SendActivationRequest(); var request = SendActivationRequest();
request.patientMobileNumber = this.mobileNumber; request.patientMobileNumber = this.mobileNumber;
request.mobileNo = '0' + this.mobileNumber.toString(); request.mobileNo = '0' + this.mobileNumber.toString();
request.deviceToken = this.deviceToken; request.deviceToken = this.deviceToken;
request.projectOutSA = this.patientOutSA == true ? 1 : 0; request.projectOutSA = this.patientOutSA == true ? true : false;
request.loginType = this.selectedOption; request.loginType = this.selectedOption;
request.oTPSendType = this.selectedOption == 1 ? 1 : 2; request.oTPSendType =
type == 1 ? type : 2; //this.selectedOption == 1 ? 1 : 2;
request.zipCode = this.zipCode; request.zipCode = this.zipCode;
request.logInTokenID = this.loginTokenID ?? ""; request.logInTokenID = this.loginTokenID ?? "";
if (this.registerd_data != null) { if (this.registerd_data != null) {
request.searchType = this.registerd_data.searchType ?? 1; request.searchType = this.registerd_data.searchType != null
request.patientID = this.registerd_data.patientID ?? 0; ? this.registerd_data.searchType
: 1;
request.patientID = this.registerd_data.patientID != null
? this.registerd_data.patientID
: 0;
request.patientIdentificationID = request.nationalID = request.patientIdentificationID = request.nationalID =
this.registerd_data.patientIdentificationID ?? '0'; this.registerd_data.patientIdentificationID != null
? this.registerd_data.patientIdentificationID
: '0';
request.isRegister = this.registerd_data.isRegister; request.isRegister = this.registerd_data.isRegister;
} else { } else {
request.searchType = request.searchType ?? 2; request.searchType = request.searchType != null ? request.searchType : 2;
request.patientID = this.user.patientID ?? 0; request.patientID = this.user.patientID != null ? this.user.patientID : 0;
request.nationalID = request.nationalID ?? '0'; request.nationalID =
request.patientIdentificationID = request.patientIdentificationID ?? '0'; request.nationalID != null ? request.nationalID : '0';
request.patientIdentificationID = request.patientIdentificationID != null
? request.patientIdentificationID
: '0';
request.isRegister = false; request.isRegister = false;
} }
request.deviceTypeID = request.searchType; request.deviceTypeID = request.searchType;
@ -520,7 +537,7 @@ class _ConfirmLogin extends State<ConfirmLogin> {
checkIfUserAgreedBefore(CheckActivationCode result) { checkIfUserAgreedBefore(CheckActivationCode result) {
print(result); print(result);
if (result.isNeedUserAgreement ==true) { if (result.isNeedUserAgreement == true) {
//move to agreement page. //move to agreement page.
} else { } else {
insertIMEI(); insertIMEI();

48
lib/pages/login/register-info.dart
Unescape Escape View File

@ -86,7 +86,9 @@ class _RegisterInfo extends State<RegisterInfo> {
Container( Container(
margin: EdgeInsets.only(bottom: 10), margin: EdgeInsets.only(bottom: 10),
child: TextFields( child: TextFields(
hintText: registerInfo.firstNameEn, hintText: registerInfo.firstNameEn == '-'
? registerInfo.firstNameAr
: registerInfo.firstNameEn,
padding: EdgeInsets.only( padding: EdgeInsets.only(
top: 20, bottom: 20, left: 10, right: 10), top: 20, bottom: 20, left: 10, right: 10),
readOnly: true, readOnly: true,
@ -95,7 +97,9 @@ class _RegisterInfo extends State<RegisterInfo> {
Container( Container(
margin: EdgeInsets.only(bottom: 10), margin: EdgeInsets.only(bottom: 10),
child: TextFields( child: TextFields(
hintText: registerInfo.secondNameEn, hintText: registerInfo.secondNameEn == '-'
? registerInfo.secondNameAr
: registerInfo.secondNameEn,
padding: EdgeInsets.only( padding: EdgeInsets.only(
top: 20, bottom: 20, left: 10, right: 10), top: 20, bottom: 20, left: 10, right: 10),
readOnly: true, readOnly: true,
@ -104,7 +108,9 @@ class _RegisterInfo extends State<RegisterInfo> {
Container( Container(
margin: EdgeInsets.only(bottom: 10), margin: EdgeInsets.only(bottom: 10),
child: TextFields( child: TextFields(
hintText: registerInfo.lastNameEn, hintText: registerInfo.lastNameEn == '-'
? registerInfo.lastNameAr
: registerInfo.lastNameEn,
padding: EdgeInsets.only( padding: EdgeInsets.only(
top: 20, bottom: 20, left: 10, right: 10), top: 20, bottom: 20, left: 10, right: 10),
readOnly: true, readOnly: true,
@ -310,9 +316,15 @@ class _RegisterInfo extends State<RegisterInfo> {
"PatientIdentificationNo": registerInfo.idNumber, "PatientIdentificationNo": registerInfo.idNumber,
"MobileNumber": registerd_data.patientMobileNumber, "MobileNumber": registerd_data.patientMobileNumber,
"PatientOutSA": registerd_data.zipCode == '966' ? 0 : 1, "PatientOutSA": registerd_data.zipCode == '966' ? 0 : 1,
"FirstName": registerInfo.firstNameEn, "FirstName": registerInfo.firstNameEn == '-'
"MiddleName": registerInfo.secondNameEn, ? registerInfo.firstNameAr
"LastName": registerInfo.lastNameEn, : registerInfo.firstNameEn,
"MiddleName":registerInfo.secondNameEn == '-'
? registerInfo.secondNameAr
: registerInfo.secondNameEn,
"LastName": registerInfo.lastNameEn == '-'
? registerInfo.lastNameAr
: registerInfo.lastNameEn,
"StrDateofBirth": registerInfo.dateOfBirth, "StrDateofBirth": registerInfo.dateOfBirth,
"DateofBirth": DateUtil.convertISODateToJsonDate( "DateofBirth": DateUtil.convertISODateToJsonDate(
registerInfo.dateOfBirth.replaceAll('/', '-')), registerInfo.dateOfBirth.replaceAll('/', '-')),
@ -331,30 +343,6 @@ class _RegisterInfo extends State<RegisterInfo> {
"PatientIdentificationID": registerInfo.idNumber, "PatientIdentificationID": registerInfo.idNumber,
"PatientMobileNumber": registerd_data.patientMobileNumber, "PatientMobileNumber": registerd_data.patientMobileNumber,
}; };
// var patientObject ={};
// var request ={};
// patientObject['PatientIdentificationType'] = this.identificationType;
// patientObject['PatientIdentificationNo'] = this.id;
// request['PatientIdentificationID'] = this.id;
// request['PatientMobileNumber'] = this.registerInfo.MobileNumber;
// patientObject['MobileNumber'] = this.registerInfo.MobileNumber;
// patientObject['PatientOutSA'] = this.registerInfo.PatientOutSA;
// request['LogInTokenID'] = this.registerInfo.LogInTokenID;
// request['activationCode'] = this.registerInfo.activationCode;
// request['ProjectID'] = this.selectedProjectID;
// patientObject['ProjectID'] = this.selectedProjectID;
// request
// request.setBirthDate(this.dateOfBirth, this.cs.convertISODateToJsonDate(this.dateOfBirth));
// request.setGender(this.gender);
// request.Patientobject.NationalityID = this.selectedNationalityID;
// request.Patientobject.StrDateofBirth = this.dateOfBirth;
// request.Patientobject.DateofBirthN = this.dateHijri;
// request.Patientobject.EmailAddress = this.eMail;
// request.Patientobject.SourceType = this.iSOCountryID
// request.Patientobject.PreferredLanguage = this.preferredLanguage
// request.Patientobject.Marital = this.maritalStatus;
//return request;
} }
bool isValid() { bool isValid() {

7
lib/services/authentication/auth_provider.dart
Unescape Escape View File

@ -233,7 +233,7 @@ class AuthProvider with ChangeNotifier {
neRequest.languageID = LANGUAGE_ID; neRequest.languageID = LANGUAGE_ID;
neRequest.deviceTypeID = DeviceTypeID; neRequest.deviceTypeID = DeviceTypeID;
neRequest.patientOutSA = neRequest.zipCode == '966' ? 0 : 1; neRequest.patientOutSA = neRequest.zipCode == '966' ? 0 : 1;
neRequest.projectOutSA = neRequest.zipCode == '966' ? 0 : 1; neRequest.projectOutSA = neRequest.zipCode == '966' ? false : true;
neRequest.isDentalAllowedBackend = false; neRequest.isDentalAllowedBackend = false;
neRequest.forRegisteration = neRequest.forRegisteration =
neRequest.isRegister != null ? neRequest.isRegister : false; neRequest.isRegister != null ? neRequest.isRegister : false;
@ -345,11 +345,14 @@ class AuthProvider with ChangeNotifier {
request.gender = user.gender; request.gender = user.gender;
request.patientID = user.patientID; request.patientID = user.patientID;
request.patientOutSA = user.outSA; request.patientOutSA = user.outSA;
request.loginType = await sharedPref.getInt(LAST_LOGIN) ?? 1; request.loginType = await sharedPref.getInt(LAST_LOGIN) != null
? await sharedPref.getInt(LAST_LOGIN)
: 1;
request.mACAddress = '00:00:00:00:00:00'; request.mACAddress = '00:00:00:00:00:00';
request.latitude = lat; request.latitude = lat;
request.longitude = long; request.longitude = long;
request.languageID = int.parse(user.preferredLanguage); request.languageID = int.parse(user.preferredLanguage);
request.patientTypeID = 2;
dynamic localRes; dynamic localRes;
try { try {
await new BaseAppClient().post(LOGGED_IN_USER_URL, await new BaseAppClient().post(LOGGED_IN_USER_URL,

19
lib/services/family_files/family_files_provider.dart
Unescape Escape View File

@ -64,7 +64,8 @@ class FamilyFilesProvider with ChangeNotifier {
} }
} }
Future<GetAllSharedRecordsByStatusResponse> getUserViewRequest(responseID) async { Future<GetAllSharedRecordsByStatusResponse> getUserViewRequest(
responseID) async {
try { try {
dynamic localRes; dynamic localRes;
Map<String, dynamic> request = {}; Map<String, dynamic> request = {};
@ -75,12 +76,13 @@ class FamilyFilesProvider with ChangeNotifier {
}, onFailure: (String error, int statusCode) { }, onFailure: (String error, int statusCode) {
return Future.error(error); return Future.error(error);
}, body: request); }, body: request);
if(localRes!=null){ if (localRes != null) {
sharedPref.setObject(FAMILY_FILE, localRes); sharedPref.setObject(FAMILY_FILE, localRes);
allSharedRecordsByStatusResponse = GetAllSharedRecordsByStatusResponse.fromJson(localRes); allSharedRecordsByStatusResponse =
return Future.value(allSharedRecordsByStatusResponse);} GetAllSharedRecordsByStatusResponse.fromJson(localRes);
else return Future.value(allSharedRecordsByStatusResponse);
return Future.error("No Data"); } else
return Future.error("No Data");
} catch (error) { } catch (error) {
print(error); print(error);
return Future.error(error); return Future.error(error);
@ -157,7 +159,7 @@ class FamilyFilesProvider with ChangeNotifier {
request.zipCode = zipCode; request.zipCode = zipCode;
request.patientMobileNumber = int.parse(cellNumber); request.patientMobileNumber = int.parse(cellNumber);
request.patientIdentificationID = patientIdentificationID; request.patientIdentificationID = patientIdentificationID;
request.projectOutSA = zipCode == '966' ? 0 : 1; request.projectOutSA = zipCode == '966' ? false : true;
request.loginType = request.searchType = 1; request.loginType = request.searchType = 1;
request.oTPSendType = 1; request.oTPSendType = 1;
request.isRegister = false; request.isRegister = false;
@ -175,6 +177,7 @@ class FamilyFilesProvider with ChangeNotifier {
throw error; throw error;
} }
} }
//TODO //TODO
Future<dynamic> checkActivationCode( Future<dynamic> checkActivationCode(
loginTokenID, activationCode, indentification, mobileNo) async { loginTokenID, activationCode, indentification, mobileNo) async {

Write Preview
Loading…
Cancel
Save