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

Hot fixes

See merge request Cloud_Solution/diplomatic-quarter!209
merge-requests/215/merge
Mohammad Aljammal 5 years ago
commit 2d9ade7a5e

@ -251,7 +251,7 @@ const UPDATE_HEALTH_TERMS =
const CHANNEL = 3; const CHANNEL = 3;
const GENERAL_ID = 'Cs2020@2016\$2958'; const GENERAL_ID = 'Cs2020@2016\$2958';
const IP_ADDRESS = '10.20.10.20'; const IP_ADDRESS = '10.20.10.20';
const VERSION_ID = 5.6; const VERSION_ID = 5.8;
const SETUP_ID = '91877'; const SETUP_ID = '91877';
const LANGUAGE = 2; const LANGUAGE = 2;
const PATIENT_OUT_SA = 0; const PATIENT_OUT_SA = 0;

@ -305,7 +305,7 @@ const Map localizedValues = {
"recieved-requests": {"en": "Recieved Requests", "ar": "الطلبات المستلمة"}, "recieved-requests": {"en": "Recieved Requests", "ar": "الطلبات المستلمة"},
"manage-files": {"en": "Manage Family Files", "ar": "إدارة ملفات العائلة"}, "manage-files": {"en": "Manage Family Files", "ar": "إدارة ملفات العائلة"},
'oxygenation': {'en': 'Oxygenation', 'ar': 'الأوكسجين'}, 'oxygenation': {'en': 'Oxygenation', 'ar': 'الأوكسجين'},
'bodyMeasurements': {'en': 'body Mass', 'ar': 'قياسات الجسم'}, 'bodyMeasurements': {'en': 'body Mass Index', 'ar': 'مؤشر الكتلة'},
'temperature': {'en': 'Temperature', 'ar': 'درجة الحرارة'}, 'temperature': {'en': 'Temperature', 'ar': 'درجة الحرارة'},
'pulse': {'en': 'Pulse', 'ar': 'النبض'}, 'pulse': {'en': 'Pulse', 'ar': 'النبض'},
'respiration': {'en': 'Respiration', 'ar': 'التنفس'}, 'respiration': {'en': 'Respiration', 'ar': 'التنفس'},
@ -1279,6 +1279,9 @@ const Map localizedValues = {
"en": "You can still submit, if you don't have Insurance Image", "en": "You can still submit, if you don't have Insurance Image",
"ar": "لا يزال بإمكانك الإرسال ، إذا لم يكن لديك صورة تأمين" "ar": "لا يزال بإمكانك الإرسال ، إذا لم يكن لديك صورة تأمين"
}, },
"info-insur-cards": {
"en": "This service allows you to view all the insurance cards that recorded during your visits to Al Habib Medical Group in addition to:",
"ar": "خدمة بطاقات التامين: هذه الخدمة تمكنك من الاطلاع على جميع بطاقات التامين والتي تم تسجيلها اثناء زياراتك لمجموعة الحبيب الطبية بالاضافة الى:"
},
}; };

@ -133,12 +133,11 @@ class BaseAppClient {
parsed['SMSLoginRequired'] == true) { parsed['SMSLoginRequired'] == true) {
onSuccess(parsed, statusCode); onSuccess(parsed, statusCode);
} }
else if(parsed['MessageStatus'] == 2){ else if(parsed['MessageStatus'] == 2 && parsed['IsAuthenticated']){
onFailure( onFailure(
parsed['message'] ?? parsed['ErrorEndUserMessage'] ?? parsed['ErrorMessage'], parsed['message'] ?? parsed['ErrorEndUserMessage'] ?? parsed['ErrorMessage'],
statusCode); statusCode);
} }
else if (!parsed['IsAuthenticated']) { else if (!parsed['IsAuthenticated']) {
await logout(); await logout();

@ -3,6 +3,7 @@ import 'package:diplomaticquarterapp/core/enum/viewstate.dart';
import 'package:diplomaticquarterapp/core/service/medical/vital_sign_service.dart'; import 'package:diplomaticquarterapp/core/service/medical/vital_sign_service.dart';
import 'package:diplomaticquarterapp/core/viewModels/base_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/base_view_model.dart';
import 'package:diplomaticquarterapp/config/shared_pref_kay.dart'; import 'package:diplomaticquarterapp/config/shared_pref_kay.dart';
import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart';
import '../../locator.dart'; import '../../locator.dart';
class DashboardViewModel extends BaseViewModel { class DashboardViewModel extends BaseViewModel {
@ -11,21 +12,22 @@ class DashboardViewModel extends BaseViewModel {
String get weightKg => _vitalSignService.weightKg; String get weightKg => _vitalSignService.weightKg;
String get heightCm => _vitalSignService.heightCm; String get heightCm => _vitalSignService.heightCm;
String booldType=""; String booldType = "-";
// ToDoCountProviderModel toDoProvider = // ToDoCountProviderModel toDoProvider =
// Provider.of<ToDoCountProviderModel>(AppGlobal.context); // Provider.of<ToDoCountProviderModel>(AppGlobal.context);
getPatientRadOrders() async { getPatientRadOrders() async {
booldType = await sharedPref.getString(BLOOD_TYPE);
if (isLogin && _vitalSignService.weightKg.isEmpty) { if (isLogin && _vitalSignService.weightKg.isEmpty) {
setState(ViewState.Busy); setState(ViewState.Busy);
await _vitalSignService.getPatientRadOrders(); await _vitalSignService.getPatientRadOrders();
if (_vitalSignService.hasError) { if (_vitalSignService.hasError) {
error = _vitalSignService.error; error = _vitalSignService.error;
setState(ViewState.Error); setState(ViewState.ErrorLocal);
} else } else {
booldType = await sharedPref.getString(BLOOD_TYPE) ?? "-";
setState(ViewState.Idle); setState(ViewState.Idle);
bloadType = await sharedPref.getString(BLOOD_TYPE) ?? "-"; }
} }
} }

@ -88,8 +88,6 @@ class MyBalanceViewModel extends BaseViewModel {
Future getBlood() async { Future getBlood() async {
setState(ViewState.Busy); setState(ViewState.Busy);
await _bloodDetailsService.getAllBloodOrders(); await _bloodDetailsService.getAllBloodOrders();
;
if (_bloodDetailsService.hasError) { if (_bloodDetailsService.hasError) {
error = _bloodDetailsService.error; error = _bloodDetailsService.error;
setState(ViewState.Error); setState(ViewState.Error);

@ -35,9 +35,7 @@ class InsuranceCardUpdateDetails extends StatelessWidget {
AppScaffold( AppScaffold(
isShowAppBar: true, isShowAppBar: true,
isShowDecPage: false, isShowDecPage: false,
appBarTitle: TranslationBase appBarTitle: TranslationBase.of(context).cardDetail,
.of(context)
.cardDetail,
body: SingleChildScrollView( body: SingleChildScrollView(
child: Column( child: Column(
children: [ children: [

@ -1,3 +1,4 @@
import 'package:diplomaticquarterapp/core/model/ImagesInfo.dart';
import 'package:diplomaticquarterapp/core/service/insurance_service.dart'; import 'package:diplomaticquarterapp/core/service/insurance_service.dart';
import 'package:diplomaticquarterapp/locator.dart'; import 'package:diplomaticquarterapp/locator.dart';
import 'package:diplomaticquarterapp/pages/insurance/insurance_details.dart'; import 'package:diplomaticquarterapp/pages/insurance/insurance_details.dart';
@ -25,11 +26,13 @@ class _InsuranceUpdateState extends State<InsuranceUpdate>
with SingleTickerProviderStateMixin { with SingleTickerProviderStateMixin {
TabController _tabController; TabController _tabController;
InsuranceCardService _insuranceCardService = locator<InsuranceCardService>(); InsuranceCardService _insuranceCardService = locator<InsuranceCardService>();
List<ImagesInfo> imagesInfo = List();
@override @override
void initState() { void initState() {
super.initState(); super.initState();
_tabController = TabController(length: 2, vsync: this); _tabController = TabController(length: 2, vsync: this);
imagesInfo.add(ImagesInfo(imageEn: 'https://hmgwebservices.com/Images/MobileApp/imges-info/insurance-card/en/0.png',imageAr: 'https://hmgwebservices.com/Images/MobileApp/imges-info/insurance-card/ar/0.png'));
} }
void dispose() { void dispose() {
@ -43,6 +46,9 @@ class _InsuranceUpdateState extends State<InsuranceUpdate>
builder: (BuildContext context, InsuranceViewModel model, Widget child) => builder: (BuildContext context, InsuranceViewModel model, Widget child) =>
AppScaffold( AppScaffold(
appBarTitle: TranslationBase.of(context).insurCards, appBarTitle: TranslationBase.of(context).insurCards,
description: TranslationBase.of(context).infoInsurCards,
infoList: TranslationBase.of(context).infoPrescriptionsPoints,
imagesInfo: imagesInfo,
isShowAppBar: true, isShowAppBar: true,
isShowDecPage: true, isShowDecPage: true,
baseViewModel: model, baseViewModel: model,
@ -107,7 +113,8 @@ class _InsuranceUpdateState extends State<InsuranceUpdate>
children: <Widget>[ children: <Widget>[
Container( Container(
child: model.getAllSharedRecordsByStatusResponse child: model.getAllSharedRecordsByStatusResponse
.getAllSharedRecordsByStatusList!=null ?? .getAllSharedRecordsByStatusList !=
null ??
false false
? ListView.builder( ? ListView.builder(
itemCount: model.getAllSharedRecordsByStatusResponse itemCount: model.getAllSharedRecordsByStatusResponse
@ -202,11 +209,23 @@ class _InsuranceUpdateState extends State<InsuranceUpdate>
onTap: () { onTap: () {
getDetails( getDetails(
projectID: 15, projectID: 15,
patientIdentificationID: model.getAllSharedRecordsByStatusResponse.getAllSharedRecordsByStatusList[index].patientIdenficationNumber, patientIdentificationID: model
setupID: '010266', .getAllSharedRecordsByStatusResponse
patientID: model.getAllSharedRecordsByStatusResponse.getAllSharedRecordsByStatusList[index].responseID, .getAllSharedRecordsByStatusList[
name: model.getAllSharedRecordsByStatusResponse.getAllSharedRecordsByStatusList[index].patientName index]
); .patientIdenficationNumber,
setupID:
'010266',
patientID: model
.getAllSharedRecordsByStatusResponse
.getAllSharedRecordsByStatusList[
index]
.responseID,
name: model
.getAllSharedRecordsByStatusResponse
.getAllSharedRecordsByStatusList[
index]
.patientName);
}, },
), ),
), ),
@ -238,41 +257,45 @@ class _InsuranceUpdateState extends State<InsuranceUpdate>
CrossAxisAlignment.start, CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.max, mainAxisSize: MainAxisSize.max,
children: <Widget>[ children: <Widget>[
if(model.user!=null) if (model.user != null)
Expanded( Expanded(
flex: 3, flex: 3,
child: Container( child: Container(
margin: EdgeInsets.only( margin: EdgeInsets.only(
top: 2.0, top: 2.0,
left: 10.0, left: 10.0,
right: 20.0), right: 20.0),
child: Column( child: Column(
crossAxisAlignment: crossAxisAlignment:
CrossAxisAlignment.start, CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Texts( Texts(
model.user.firstName??'' + " " + model.user.lastName??'', model.user.firstName ??
fontSize: 14, '' +
color: Colors.black, " " +
fontWeight: FontWeight.w500, model.user.lastName ??
), '',
SizedBox( fontSize: 14,
height: 8, color: Colors.black,
), fontWeight: FontWeight.w500,
Texts( ),
TranslationBase.of(context) SizedBox(
.fileno + height: 8,
": " + ),
model.user.patientID Texts(
.toString(), TranslationBase.of(context)
fontSize: 14, .fileno +
color: Colors.black, ": " +
fontWeight: FontWeight.w500, model.user.patientID
) .toString(),
], fontSize: 14,
color: Colors.black,
fontWeight: FontWeight.w500,
)
],
),
), ),
), ),
),
Expanded( Expanded(
flex: 2, flex: 2,
child: Container( child: Container(
@ -290,11 +313,16 @@ class _InsuranceUpdateState extends State<InsuranceUpdate>
getDetails( getDetails(
setupID: '010266', setupID: '010266',
projectID: 15, projectID: 15,
patientIdentificationID: model.user.patientIdentificationNo, patientIdentificationID:
patientID: model.user.patientID, model.user
name: model.user.firstName + " " + model.user.lastName .patientIdentificationNo,
patientID: model
); .user.patientID,
name: model.user
.firstName +
" " +
model
.user.lastName);
}, },
), ),
), ),
@ -425,7 +453,12 @@ class _InsuranceUpdateState extends State<InsuranceUpdate>
); );
} }
getDetails({String setupID, int projectID, String patientIdentificationID,int patientID,String name}) { getDetails(
{String setupID,
int projectID,
String patientIdentificationID,
int patientID,
String name}) {
GifLoaderDialogUtils.showMyDialog(context); GifLoaderDialogUtils.showMyDialog(context);
_insuranceCardService _insuranceCardService
.getPatientInsuranceDetails( .getPatientInsuranceDetails(
@ -436,8 +469,16 @@ class _InsuranceUpdateState extends State<InsuranceUpdate>
.then((value) { .then((value) {
GifLoaderDialogUtils.hideDialog(context); GifLoaderDialogUtils.hideDialog(context);
if (_insuranceCardService.insuranceCardDetails != null) { if (_insuranceCardService.insuranceCardDetails != null) {
Navigator.push(context, Navigator.push(
FadePage(page: InsuranceCardUpdateDetails(insuranceCardDetailsModel: _insuranceCardService.insuranceCardDetails,patientID: patientID,patientIdentificationID: patientIdentificationID,name: name,))); context,
FadePage(
page: InsuranceCardUpdateDetails(
insuranceCardDetailsModel:
_insuranceCardService.insuranceCardDetails,
patientID: patientID,
patientIdentificationID: patientIdentificationID,
name: name,
)));
} else { } else {
AppToast.showErrorToast(message: _insuranceCardService.error); AppToast.showErrorToast(message: _insuranceCardService.error);
} }

@ -54,7 +54,6 @@ class _HomePageState extends State<HomePage> {
return BaseView<DashboardViewModel>( return BaseView<DashboardViewModel>(
onModelReady: (model) => model.getPatientRadOrders(), onModelReady: (model) => model.getPatientRadOrders(),
builder: (_, model, wi) => AppScaffold( builder: (_, model, wi) => AppScaffold(
isShowDecPage: false, isShowDecPage: false,
body: Container( body: Container(
width: double.infinity, width: double.infinity,

@ -57,6 +57,7 @@ class _HomeReportPageState extends State<HomeReportPage>
builder: (_, model, widget) => AppScaffold( builder: (_, model, widget) => AppScaffold(
isShowAppBar: true, isShowAppBar: true,
appBarTitle: TranslationBase.of(context).newMedReport, appBarTitle: TranslationBase.of(context).newMedReport,
title: TranslationBase.of(context).medReport,
description: TranslationBase.of(context).infoMonthReport, description: TranslationBase.of(context).infoMonthReport,
baseViewModel: model, baseViewModel: model,
imagesInfo: imagesInfo, imagesInfo: imagesInfo,

@ -23,53 +23,14 @@ class VitalSignItemDetailsScreen extends StatelessWidget {
case VitalSignDetails.BodyMeasurements: case VitalSignDetails.BodyMeasurements:
VSchart = [ VSchart = [
{ {
'name': 'Height', 'name': 'BMI',
'nameAr': 'الطول', 'nameAr': 'مؤشر الكتلة',
'title1': 'Date', 'title1': 'Date',
'title2': 'Cm', 'title2': 'BMI',
'title2Ar': 'سم', 'title2Ar': 'الكتلة',
'viewKey': 'HeightCm',
},
{
'name': 'Weight Kg',
'nameAr': 'الوزن كجم',
'title1': 'Date',
'title2': 'Kg',
'title2Ar': 'كجم',
'viewKey': 'WeightKg',
},
{
'name': 'BMI ',
'nameAr': 'مؤشر كتلة الجسم',
'title1': 'Date',
'title2': 'BodyMass',
'title2Ar': 'كتلة الجسم',
'viewKey': 'BodyMassIndex', 'viewKey': 'BodyMassIndex',
}, },
{
'name': 'Head Circum Cm',
'nameAr': 'محيط رأس سم',
'title1': 'Date',
'title2': 'Cm',
'title2Ar': 'سم',
'viewKey': 'HeadCircumCm',
},
{
'name': 'Ideal Body Weight (Lbs)',
'nameAr': 'وزن الجسم المثالي (رطل)',
'title1': 'Date',
'title2': 'Ideal Weight',
'title2Ar': 'الوزن المثالي',
'viewKey': 'IdealBodyWeightLbs',
},
{
'name': 'Lean Body WeightLbs (Lbs)',
'nameAr': 'رطل وزن الجسم النحيل (رطل)',
'title1': 'Date',
'title2': 'Lean Weight',
'title2Ar': 'وزن خفيف',
'viewKey': 'LeanBodyWeightLbs',
}
]; ];
break; break;

@ -1064,6 +1064,7 @@ class TranslationBase {
String get disagree => localizedValues['disagree'][locale.languageCode]; String get disagree => localizedValues['disagree'][locale.languageCode];
String get requestSent => localizedValues['request-sent'][locale.languageCode]; String get requestSent => localizedValues['request-sent'][locale.languageCode];
String get attachInsuraceImage => localizedValues['attach-insurace-image'][locale.languageCode]; String get attachInsuraceImage => localizedValues['attach-insurace-image'][locale.languageCode];
String get infoInsurCards => localizedValues['info-insur-cards'][locale.languageCode];
} }

@ -27,14 +27,21 @@ class AppExpandableNotifier extends StatefulWidget {
} }
class _AppExpandableNotifier extends State<AppExpandableNotifier> { class _AppExpandableNotifier extends State<AppExpandableNotifier> {
@override @override
Widget build(BuildContext context) { void initState() {
setState(() { setState(() {
if (widget.isExpand == true) { if (widget.isExpand) {
widget.expandFlag = widget.isExpand; widget.expandFlag = widget.isExpand;
widget.controller.expanded = true; widget.controller.expanded = true;
} }
}); });
super.initState();
}
@override
Widget build(BuildContext context) {
return ExpandableNotifier( return ExpandableNotifier(
child: Padding( child: Padding(
padding: const EdgeInsets.only(left: 10, right: 10, top: 4), padding: const EdgeInsets.only(left: 10, right: 10, top: 4),
@ -90,11 +97,7 @@ class _AppExpandableNotifier extends State<AppExpandableNotifier> {
onPressed: () { onPressed: () {
setState(() { setState(() {
widget.expandFlag = !widget.expandFlag; widget.expandFlag = !widget.expandFlag;
if (widget.expandFlag == true) { widget.controller.expanded = widget.expandFlag;
widget.controller.expanded = true;
} else {
widget.controller.expanded = false;
}
}); });
}), }),
]), ]),

@ -73,7 +73,7 @@ class _NotAutPageState extends State<NotAutPage> {
width: 40, width: 40,
height: 40, height: 40,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(15), borderRadius: BorderRadius.circular(20),
color: Theme.of(context).primaryColor), color: Theme.of(context).primaryColor),
child: Center( child: Center(
child: Texts('${index+1}',color: Colors.white,), child: Texts('${index+1}',color: Colors.white,),

Loading…
Cancel
Save