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

Sultan

See merge request Cloud_Solution/diplomatic-quarter!306
diplomatic-quarter-haroon^2
Mohammad Aljammal 5 years ago
commit a1a70d5816

@ -0,0 +1,6 @@
<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 18 18">
<g id="Group_1261" data-name="Group 1261" transform="translate(-148.52 -172.52)">
<path id="Path_1724" data-name="Path 1724" d="M9,0a9,9,0,0,1,9,9,9.18,9.18,0,0,1-1.863,5.483A8.844,8.844,0,0,1,9,18,9,9,0,0,1,9,0Z" transform="translate(148.52 172.52)" fill="#e6b71b"/>
<path id="hourglass_2_" data-name="hourglass (2)" d="M10.865,10.178H10.4V8.663a2.662,2.662,0,0,0-.88-1.977l-.783-.7a.578.578,0,0,1,0-.86l.783-.7a2.665,2.665,0,0,0,.88-1.978V.925h.463a.463.463,0,0,0,0-.925h-7.4a.463.463,0,0,0,0,.925h.463V2.439a2.662,2.662,0,0,0,.88,1.977l.783.7a.578.578,0,0,1,0,.86l-.783.7a2.665,2.665,0,0,0-.88,1.978v1.514H3.463a.463.463,0,1,0,0,.925h7.4a.463.463,0,0,0,0-.925ZM5.313,8.711a1.264,1.264,0,0,1,.373-.9L6.918,6.578a.347.347,0,0,1,.491,0L8.642,7.811a1.264,1.264,0,0,1,.373.9v1.467h-3.7Z" transform="translate(150.356 175.968)" fill="#fff"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 947 B

@ -0,0 +1,8 @@
<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 18 18">
<g id="Group_1261" data-name="Group 1261" transform="translate(-148.52 -172.52)">
<path id="Path_1724" data-name="Path 1724" d="M9,0a9,9,0,0,1,9,9,9.18,9.18,0,0,1-1.863,5.483A8.844,8.844,0,0,1,9,18,9,9,0,0,1,9,0Z" transform="translate(148.52 172.52)" fill="#5ab145"/>
<g id="check_4_" data-name="check (4)" transform="translate(151.64 177.596)">
<path id="Path_1722" data-name="Path 1722" d="M10.35,68.552l-5.79,5.79L1.411,71.193,0,72.6l4.56,4.56,7.2-7.2Z" transform="translate(0 -68.552)" fill="#fff"/>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 627 B

@ -61,12 +61,13 @@ class AuthenticatedUser {
dynamic tempAddress; dynamic tempAddress;
dynamic zipCode; dynamic zipCode;
dynamic isFamily; dynamic isFamily;
dynamic cRSVerificationStatus;
// dynamic patientPayType; // dynamic patientPayType;
// dynamic patientType; // dynamic patientType;
// dynamic status; // dynamic status;
AuthenticatedUser({ AuthenticatedUser(
this.setupID, {this.setupID,
this.patientType, this.patientType,
this.patientID, this.patientID,
this.firstName, this.firstName,
@ -124,8 +125,8 @@ class AuthenticatedUser {
this.strDateofBirth, this.strDateofBirth,
this.tempAddress, this.tempAddress,
this.zipCode, this.zipCode,
this.isFamily this.isFamily,
}); this.cRSVerificationStatus});
AuthenticatedUser.fromJson(Map<String, dynamic> json) { AuthenticatedUser.fromJson(Map<String, dynamic> json) {
setupID = json['SetupID']; setupID = json['SetupID'];
@ -193,6 +194,7 @@ class AuthenticatedUser {
tempAddress = json['TempAddress']; tempAddress = json['TempAddress'];
zipCode = json['ZipCode']; zipCode = json['ZipCode'];
isFamily = json['IsFamily']; isFamily = json['IsFamily'];
cRSVerificationStatus = json['CRSVerificationStatus'];
} }
Map<String, dynamic> toJson() { Map<String, dynamic> toJson() {
@ -259,6 +261,7 @@ class AuthenticatedUser {
data['TempAddress'] = this.tempAddress; data['TempAddress'] = this.tempAddress;
data['ZipCode'] = this.zipCode; data['ZipCode'] = this.zipCode;
data['IsFamily'] = this.isFamily; data['IsFamily'] = this.isFamily;
data['CRSVerificationStatus'] = this.cRSVerificationStatus;
return data; return data;
} }
} }

@ -329,9 +329,9 @@ class List {
dynamic strDateofBirth; dynamic strDateofBirth;
dynamic tempAddress; dynamic tempAddress;
dynamic zipCode; dynamic zipCode;
dynamic cRSVerificationStatus;
List({ List(
this.setupID, {this.setupID,
this.patientType, this.patientType,
this.patientID, this.patientID,
this.firstName, this.firstName,
@ -389,7 +389,7 @@ class List {
this.strDateofBirth, this.strDateofBirth,
this.tempAddress, this.tempAddress,
this.zipCode, this.zipCode,
}); this.cRSVerificationStatus});
List.fromJson(Map<String, dynamic> json) { List.fromJson(Map<String, dynamic> json) {
setupID = json['SetupID']; setupID = json['SetupID'];
@ -452,6 +452,7 @@ class List {
strDateofBirth = json['StrDateofBirth']; strDateofBirth = json['StrDateofBirth'];
tempAddress = json['TempAddress']; tempAddress = json['TempAddress'];
zipCode = json['ZipCode']; zipCode = json['ZipCode'];
cRSVerificationStatus = json['CRSVerificationStatus'];
} }
Map<String, dynamic> toJson() { Map<String, dynamic> toJson() {
@ -516,7 +517,7 @@ class List {
data['StrDateofBirth'] = this.strDateofBirth; data['StrDateofBirth'] = this.strDateofBirth;
data['TempAddress'] = this.tempAddress; data['TempAddress'] = this.tempAddress;
data['ZipCode'] = this.zipCode; data['ZipCode'] = this.zipCode;
data['CRSVerificationStatus'] = this.cRSVerificationStatus;
return data; return data;
} }
} }

@ -88,7 +88,7 @@ class Patientobject {
String sourceType; String sourceType;
String preferredLanguage; String preferredLanguage;
String marital; String marital;
String eHealthIDField;
Patientobject( Patientobject(
{this.tempValue, {this.tempValue,
this.patientIdentificationType, this.patientIdentificationType,
@ -109,7 +109,8 @@ class Patientobject {
this.emailAddress, this.emailAddress,
this.sourceType, this.sourceType,
this.preferredLanguage, this.preferredLanguage,
this.marital}); this.marital,
this.eHealthIDField});
Patientobject.fromJson(Map<String, dynamic> json) { Patientobject.fromJson(Map<String, dynamic> json) {
tempValue = json['TempValue']; tempValue = json['TempValue'];
@ -133,6 +134,7 @@ class Patientobject {
preferredLanguage = json['PreferredLanguage']; preferredLanguage = json['PreferredLanguage'];
marital = json['Marital']; marital = json['Marital'];
eHealthIDField = json['eHealthIDField'];
} }
Map<String, dynamic> toJson() { Map<String, dynamic> toJson() {
@ -158,6 +160,7 @@ class Patientobject {
data['PreferredLanguage'] = this.preferredLanguage; data['PreferredLanguage'] = this.preferredLanguage;
data['Marital'] = this.marital; data['Marital'] = this.marital;
data['eHealthIDField'] = this.eHealthIDField;
return data; return data;
} }
} }

@ -26,6 +26,7 @@ import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart'; import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:diplomaticquarterapp/widgets/text/app_texts_widget.dart'; import 'package:diplomaticquarterapp/widgets/text/app_texts_widget.dart';
import '../../widgets/data_display/medical/LabResult/LineChartCurved.dart'; import '../../widgets/data_display/medical/LabResult/LineChartCurved.dart';
@ -219,9 +220,11 @@ class _HomePageState extends State<HomePage> {
SizedBox( SizedBox(
height: 8, height: 8,
), ),
Row(
children: [
Texts( Texts(
projectViewModel projectViewModel.user
.user.firstName + .firstName +
" " + " " +
projectViewModel projectViewModel
.user.lastName, .user.lastName,
@ -229,6 +232,20 @@ class _HomePageState extends State<HomePage> {
bold: true, bold: true,
fontSize: 15, fontSize: 15,
), ),
projectViewModel.user
.cRSVerificationStatus ==
2
? SvgPicture.asset(
'assets/images/svg/verification_check.svg')
: projectViewModel
.user
.cRSVerificationStatus ==
3
? SvgPicture.asset(
'assets/images/svg/pending.svg')
: SizedBox()
],
),
Texts( Texts(
'${projectViewModel.user.patientID}', '${projectViewModel.user.patientID}',
color: Colors.white, color: Colors.white,

@ -294,19 +294,19 @@ class _RegisterInfo extends State<RegisterInfo> {
GifLoaderDialogUtils.hideDialog(context), GifLoaderDialogUtils.hideDialog(context),
// userData = result.list; // userData = result.list;
//AuthenticatedUser.fromJson(result['List'][0]), //AuthenticatedUser.fromJson(result['List'][0]),
if(result is String){ if (result is String)
{
new ConfirmDialog( new ConfirmDialog(
context: context, context: context,
confirmMessage: result, confirmMessage: result,
okText: TranslationBase.of(context).ok, okText: TranslationBase.of(context).ok,
cancelText: TranslationBase.of(context).cancel_nocaps, cancelText: TranslationBase.of(context).cancel_nocaps,
okFunction: () => { okFunction: () => {ConfirmDialog.closeAlertDialog(context)},
cancelFunction: () => {
ConfirmDialog.closeAlertDialog(context) ConfirmDialog.closeAlertDialog(context)
}, }).showAlertDialog(context)
cancelFunction: () => {ConfirmDialog.closeAlertDialog(context)}) }
.showAlertDialog(context) else
}else
{ {
sharedPref.remove(FAMILY_FILE), sharedPref.remove(FAMILY_FILE),
result['List'][0]['IsFamily'] = false, result['List'][0]['IsFamily'] = false,
@ -317,7 +317,6 @@ class _RegisterInfo extends State<RegisterInfo> {
authenticatedUserObject.isLogin = true, authenticatedUserObject.isLogin = true,
appointmentRateViewModel.isLogin = true, appointmentRateViewModel.isLogin = true,
projectViewModel.isLogin = true, projectViewModel.isLogin = true,
Navigator.of(context).pushNamed(HOME), Navigator.of(context).pushNamed(HOME),
AppToast.showSuccessToast(message: result["ErrorEndUserMessage"]) AppToast.showSuccessToast(message: result["ErrorEndUserMessage"])
} }
@ -366,12 +365,16 @@ 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,
"FirstNameN":registerInfo.firstNameAr =='-' ?"": registerInfo.firstNameAr, "FirstNameN":
"FirstName": registerInfo.firstNameEn =='-' ?"":registerInfo.firstNameEn, registerInfo.firstNameAr == '-' ? "" : registerInfo.firstNameAr,
"MiddleNameN":registerInfo.secondNameAr, "FirstName":
"MiddleName":registerInfo.secondNameEn, registerInfo.firstNameEn == '-' ? "" : registerInfo.firstNameEn,
"LastNameN": registerInfo.lastNameAr =='-'? "" : registerInfo.lastNameAr, "MiddleNameN": registerInfo.secondNameAr,
"LastName": registerInfo.lastNameEn =='-' ? "": registerInfo.lastNameEn, "MiddleName": registerInfo.secondNameEn,
"LastNameN":
registerInfo.lastNameAr == '-' ? "" : registerInfo.lastNameAr,
"LastName":
registerInfo.lastNameEn == '-' ? "" : registerInfo.lastNameEn,
"StrDateofBirth": registerInfo.dateOfBirth, "StrDateofBirth": registerInfo.dateOfBirth,
"DateofBirth": DateUtil.convertISODateToJsonDate( "DateofBirth": DateUtil.convertISODateToJsonDate(
registerInfo.dateOfBirth.replaceAll('/', '-')), registerInfo.dateOfBirth.replaceAll('/', '-')),
@ -386,6 +389,7 @@ class _RegisterInfo extends State<RegisterInfo> {
: registerInfo.maritalStatusCode == 'M' : registerInfo.maritalStatusCode == 'M'
? '1' ? '1'
: '2', : '2',
"eHealthIDField": registerInfo.healthId
}, },
"PatientIdentificationID": registerInfo.idNumber, "PatientIdentificationID": registerInfo.idNumber,
"PatientMobileNumber": registerd_data.patientMobileNumber, "PatientMobileNumber": registerd_data.patientMobileNumber,

Loading…
Cancel
Save