Merge branch 'sultan' into 'diplomatic-quarter-live'

Sultan

See merge request Cloud_Solution/diplomatic-quarter!221
merge-update-with-lab-changes
Mohammad Aljammal 5 years ago
commit 8ac3bc71dc

@ -36,8 +36,10 @@ const GET_PRESCRIPTION_REPORT_ENH =
///Lab Order ///Lab Order
const GET_Patient_LAB_ORDERS = 'Services/Patients.svc/REST/GetPatientLabOrders'; const GET_Patient_LAB_ORDERS = 'Services/Patients.svc/REST/GetPatientLabOrders';
const GET_Patient_LAB_SPECIAL_RESULT = 'Services/Patients.svc/REST/GetPatientLabSpecialResults'; const GET_Patient_LAB_SPECIAL_RESULT =
const SEND_LAB_RESULT_EMAIL = 'Services/Notifications.svc/REST/SendLabReportEmail'; 'Services/Patients.svc/REST/GetPatientLabSpecialResults';
const SEND_LAB_RESULT_EMAIL =
'Services/Notifications.svc/REST/SendLabReportEmail';
const GET_Patient_LAB_RESULT = const GET_Patient_LAB_RESULT =
'Services/Patients.svc/REST/GetPatientLabResults'; 'Services/Patients.svc/REST/GetPatientLabResults';
const GET_Patient_LAB_ORDERS_RESULT = const GET_Patient_LAB_ORDERS_RESULT =
@ -270,9 +272,10 @@ const GET_PAtIENTS_INSURANCE_UPDATED =
"Services/Patients.svc/REST/PatientER_GetPatientInsuranceCardUpdateHistory"; "Services/Patients.svc/REST/PatientER_GetPatientInsuranceCardUpdateHistory";
const INSURANCE_DETAILS = "Services/Patients.svc/REST/Get_InsuranceCheckList"; const INSURANCE_DETAILS = "Services/Patients.svc/REST/Get_InsuranceCheckList";
const GET_PATIENT_INSURANCE_DETAILS = "Services/Patients.svc/REST/PatientER_GetPatientInsuranceDetails"; const GET_PATIENT_INSURANCE_DETAILS =
const UPLOAD_INSURANCE_CARD = 'Services/Patients.svc/REST/PatientER_PatientInfoForInsuranceCardUpdate'; "Services/Patients.svc/REST/PatientER_GetPatientInsuranceDetails";
const UPLOAD_INSURANCE_CARD =
'Services/Patients.svc/REST/PatientER_PatientInfoForInsuranceCardUpdate';
const GET_VACCINES = "Services/Patients.svc/REST/GetDoneVaccinesByPatientID"; const GET_VACCINES = "Services/Patients.svc/REST/GetDoneVaccinesByPatientID";
const GET_VACCINES_EMAIL = "Services/Notifications.svc/REST/SendVaccinesEmail"; const GET_VACCINES_EMAIL = "Services/Notifications.svc/REST/SendVaccinesEmail";

@ -725,7 +725,8 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
this.sharedPref.setObject(LOGIN_TOKEN_ID, result.logInTokenID); this.sharedPref.setObject(LOGIN_TOKEN_ID, result.logInTokenID);
this.sharedPref.setString(TOKEN, result.authenticationTokenID); this.sharedPref.setString(TOKEN, result.authenticationTokenID);
await authenticatedUserObject.getUser(getUser: true); await authenticatedUserObject.getUser(getUser: true);
Provider.of<ProjectViewModel>(context, listen: false).user =
authenticatedUserObject.user;
Provider.of<ProjectViewModel>(context, listen: false) Provider.of<ProjectViewModel>(context, listen: false)
.setUser(authenticatedUserObject.user); .setUser(authenticatedUserObject.user);
appointmentRateViewModel appointmentRateViewModel

@ -103,127 +103,132 @@ class _ConfirmLogin extends State<ConfirmLogin> {
width: SizeConfig.realScreenWidth, width: SizeConfig.realScreenWidth,
child: Column( child: Column(
children: <Widget>[ children: <Widget>[
Expanded( user != null && isMoreOption == false
flex: 3, ? Column(
child: user != null && isMoreOption == false mainAxisAlignment: MainAxisAlignment.spaceEvenly,
? Column( crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.spaceEvenly, children: <Widget>[
crossAxisAlignment: CrossAxisAlignment.start, Image.asset(
children: <Widget>[ 'assets/images/DQ/dq_logo_icon.png',
Image.asset( height: 90,
'assets/images/DQ/dq_logo_icon.png', width: 90,
height: 90, ),
width: 90, AppText(
), TranslationBase.of(context).welcomeBack +
AppText( ' ' +
TranslationBase.of(context).welcomeBack + user.name,
' ' + fontSize: SizeConfig.textMultiplier * 3.5,
user.name, ),
fontSize: SizeConfig.textMultiplier * 3.5, SizedBox(
), height: 20,
AppText( ),
TranslationBase.of(context).accountInfo, AppText(
fontSize: SizeConfig.textMultiplier * 2.5, TranslationBase.of(context).accountInfo,
), fontSize: SizeConfig.textMultiplier * 2.5,
Card( ),
color: Colors.grey[300], SizedBox(
child: Row( height: 20,
children: <Widget>[ ),
Expanded( Card(
child: ListTile( color: Colors.grey[300],
title: Text( child: Row(
TranslationBase.of(context).lastLoginAt, children: <Widget>[
textAlign: TextAlign.center, Flexible(
), child: ListTile(
subtitle: Text( title: Text(
user.editedOn != null TranslationBase.of(context).lastLoginAt,
textAlign: TextAlign.center,
overflow: TextOverflow.ellipsis,
),
subtitle: Text(
user.editedOn != null
? formatDate(
DateUtil.convertStringToDate(
user.editedOn))
: user.createdOn != null
? formatDate( ? formatDate(
DateUtil.convertStringToDate( DateUtil.convertStringToDate(
user.editedOn)) user.createdOn))
: '--', : '--',
textAlign: TextAlign.center), overflow: TextOverflow.ellipsis,
)), textAlign: TextAlign.center),
Expanded( )),
child: ListTile( Flexible(
title: Text( child: ListTile(
TranslationBase.of(context) title: Text(
.lastLoginWith, TranslationBase.of(context).lastLoginWith,
textAlign: TextAlign.center), overflow: TextOverflow.ellipsis,
subtitle: Text( textAlign: TextAlign.center),
getType(user.logInType, context), subtitle: Text(
textAlign: TextAlign.center), getType(user.logInType, context),
)) overflow: TextOverflow.ellipsis,
], textAlign: TextAlign.center),
)) ))
], ],
) )),
: Column( ],
mainAxisAlignment: MainAxisAlignment.spaceEvenly, )
crossAxisAlignment: CrossAxisAlignment.start, : Column(
children: <Widget>[ mainAxisAlignment: MainAxisAlignment.spaceEvenly,
Image.asset( crossAxisAlignment: CrossAxisAlignment.start,
'assets/images/DQ/dq_logo_icon.png', children: <Widget>[
height: 90, Image.asset(
width: 90, 'assets/images/DQ/dq_logo_icon.png',
), height: 90,
this.onlySMSBox == false width: 90,
? AppText( ),
TranslationBase.of(context) this.onlySMSBox == false
.verifyLoginWith, ? AppText(
fontSize: SizeConfig.textMultiplier * 3.5, TranslationBase.of(context).verifyLoginWith,
textAlign: TextAlign.left, fontSize: SizeConfig.textMultiplier * 3.5,
) textAlign: TextAlign.left,
: AppText( )
TranslationBase.of(context) : AppText(
.verifyFingerprint2, TranslationBase.of(context)
fontSize: SizeConfig.textMultiplier * 2.5, .verifyFingerprint2,
textAlign: TextAlign.start, fontSize: SizeConfig.textMultiplier * 2.5,
), textAlign: TextAlign.start,
])), ),
]),
user != null && isMoreOption == false user != null && isMoreOption == false
? Expanded( ? Column(
flex: 2, mainAxisAlignment: MainAxisAlignment.start,
child: Column( crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.start, children: <Widget>[
crossAxisAlignment: CrossAxisAlignment.start, Row(
children: <Widget>[
Row(
mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[
Expanded(
child: InkWell(
onTap: () => {
authenticateUser(
3, BiometricType.face.index)
},
child: getButton(user.logInType))),
Expanded(child: getButton(5))
])
]))
: Expanded(
flex: 4,
child: Column(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
onlySMSBox == false
? Row(
mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[
Expanded(child: getButton(3)),
Expanded(child: getButton(2))
],
)
: SizedBox(),
Row(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[ children: <Widget>[
Expanded(child: getButton(1)), Expanded(
Expanded(child: getButton(4)) child: InkWell(
], onTap: () => {
), authenticateUser(
]), 3, BiometricType.face.index)
), },
child: getButton(user.logInType))),
Expanded(child: getButton(5))
])
])
: Column(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
onlySMSBox == false
? Row(
mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[
Expanded(child: getButton(3)),
Expanded(child: getButton(2))
],
)
: SizedBox(),
Row(
mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[
Expanded(child: getButton(1)),
Expanded(child: getButton(4))
],
),
]),
Expanded( Expanded(
flex: 1, flex: 1,
child: Column( child: Column(
@ -580,6 +585,9 @@ class _ConfirmLogin extends State<ConfirmLogin> {
authenticatedUserObject.isLogin = true; authenticatedUserObject.isLogin = true;
appointmentRateViewModel.isLogin = true; appointmentRateViewModel.isLogin = true;
projectViewModel.isLogin = true; projectViewModel.isLogin = true;
projectViewModel.user = authenticatedUserObject.user;
Provider.of<ProjectViewModel>(context, listen: false)
.setUser(authenticatedUserObject.user);
getToDoCount(); getToDoCount();
appointmentRateViewModel appointmentRateViewModel
.getIsLastAppointmentRatedList() .getIsLastAppointmentRatedList()
@ -627,7 +635,7 @@ class _ConfirmLogin extends State<ConfirmLogin> {
borderColor: Colors.grey, borderColor: Colors.grey,
showBorder: true, showBorder: true,
child: Padding( child: Padding(
padding: EdgeInsets.fromLTRB(25, 10, 25, 10), padding: EdgeInsets.fromLTRB(30, 15, 30, 15),
child: Column( child: Column(
children: <Widget>[ children: <Widget>[
Image.asset( Image.asset(
@ -653,7 +661,7 @@ class _ConfirmLogin extends State<ConfirmLogin> {
borderColor: Colors.grey, borderColor: Colors.grey,
showBorder: true, showBorder: true,
child: Padding( child: Padding(
padding: EdgeInsets.fromLTRB(20, 10, 20, 10), padding: EdgeInsets.fromLTRB(30, 15, 30, 15),
child: Column( child: Column(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[ children: <Widget>[
@ -662,12 +670,17 @@ class _ConfirmLogin extends State<ConfirmLogin> {
height: SizeConfig.imageSizeMultiplier * 13, height: SizeConfig.imageSizeMultiplier * 13,
width: SizeConfig.imageSizeMultiplier * 16, width: SizeConfig.imageSizeMultiplier * 16,
), ),
SizedBox( projectViewModel.isArabic
height: 20, ? SizedBox(
), height: 0,
)
: SizedBox(
height: 20,
),
AppText( AppText(
TranslationBase.of(context).verifySMS, TranslationBase.of(context).verifySMS,
fontSize: SizeConfig.textMultiplier * 2, fontSize: SizeConfig.textMultiplier * 2,
textAlign: TextAlign.center,
) )
], ],
), ),
@ -683,7 +696,7 @@ class _ConfirmLogin extends State<ConfirmLogin> {
borderColor: Colors.grey, borderColor: Colors.grey,
showBorder: true, showBorder: true,
child: Padding( child: Padding(
padding: EdgeInsets.fromLTRB(25, 10, 25, 10), padding: EdgeInsets.fromLTRB(30, 15, 30, 15),
child: Column( child: Column(
children: <Widget>[ children: <Widget>[
Image.asset( Image.asset(
@ -712,7 +725,7 @@ class _ConfirmLogin extends State<ConfirmLogin> {
borderColor: Colors.grey, borderColor: Colors.grey,
showBorder: true, showBorder: true,
child: Padding( child: Padding(
padding: EdgeInsets.fromLTRB(20, 10, 20, 10), padding: EdgeInsets.fromLTRB(30, 15, 30, 15),
child: Column( child: Column(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[ children: <Widget>[
@ -755,9 +768,13 @@ class _ConfirmLogin extends State<ConfirmLogin> {
height: SizeConfig.imageSizeMultiplier * 13, height: SizeConfig.imageSizeMultiplier * 13,
width: SizeConfig.imageSizeMultiplier * 16, width: SizeConfig.imageSizeMultiplier * 16,
), ),
SizedBox( projectViewModel.isArabic
height: 20, ? SizedBox(
), height: 15,
)
: SizedBox(
height: 20,
),
AppText( AppText(
TranslationBase.of(context).moreVerification, TranslationBase.of(context).moreVerification,
fontSize: SizeConfig.textMultiplier * 2, fontSize: SizeConfig.textMultiplier * 2,

@ -584,6 +584,8 @@ class _AppDrawerState extends State<AppDrawer> {
this.sharedPref.setString(TOKEN, result.authenticationTokenID); this.sharedPref.setString(TOKEN, result.authenticationTokenID);
// Navigator.of(context).pop(); // Navigator.of(context).pop();
await authenticatedUserObject.getUser(getUser: true); await authenticatedUserObject.getUser(getUser: true);
Provider.of<ProjectViewModel>(context, listen: false).user =
authenticatedUserObject.user;
Provider.of<ProjectViewModel>(context, listen: false) Provider.of<ProjectViewModel>(context, listen: false)
.setUser(authenticatedUserObject.user); .setUser(authenticatedUserObject.user);
appointmentRateViewModel appointmentRateViewModel

Loading…
Cancel
Save