From 21c7c94ef2e672da674edb590f6b2a94e76b5a6d Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Wed, 25 Nov 2020 14:14:39 +0300 Subject: [PATCH 1/8] updates & fixes --- DQKey.jks | Bin 0 -> 2269 bytes Keystore Pass.rtf | 9 +++++++++ key.properties | 4 ++++ lib/pages/MyAppointments/AppointmentDetails.dart | 1 + lib/pages/landing/home_page.dart | 14 +++++++------- 5 files changed, 21 insertions(+), 7 deletions(-) create mode 100644 DQKey.jks create mode 100644 Keystore Pass.rtf create mode 100644 key.properties diff --git a/DQKey.jks b/DQKey.jks new file mode 100644 index 0000000000000000000000000000000000000000..7c844584b4958f6b20b4ce3b3ceae1fac4b8e2a3 GIT binary patch literal 2269 zcmc&#X*AT08lTNrCPv1-PL{4>_>agwMpyn_2+KK&FXhJJrNE71Td@6`#HtaCvKiP~NBk(~Ym&tw7B zDr`jY6{=}N%<8nH`w2q_K1q$i5#I)svs6gSw)J~iK5%Z56ZiK3aoegi*) z3`3nVbF01*8>Djj*?d9-S^Kcll~N-9E~gf-ySk6y1k?N8K|>+Yp}hiMEFuz*CZ}2$ zu9?T($|UtEuWQ5i;p3`o>k`w0IXz`;jW0RHLvcMydW!M<14gRXo6Fl7Rjn}Q z^@TR2*Jm1>$MUOp?A|~wF@LmA&9l7P3$ct~KT3&PVbElN89vkP0djqC9u!CGJ{O>s zrr?8;k-mR3DLE>CIm0=~pZLMWlp~BHE5PTKujol>z`q%%==~xQ?s{*~9IiH@X>yz4 z(C17%yW@6=5<*yqN-GGVy?q*d6cY>K==*I>u7&GI2-{|twp%p2D%TG~{6D;yY6(mI zwQN{rsxxq?P4<&)tb>H6;ZM5)BHvJKo>1OxO4du+wJZ!SKnabhu3yysmad8X5tXtLhbMH@|Ru{n`W!K@3*=hQN9i*eV8BY+zqI>pbYDF`B zDfPosx#+FXf|Ko*es*O0{Qzob;pa7@sV?$BU`Qxe{OFsT@onWH{A=aQr^<2H!TlJY z`YraLH_^3<6B^d?zP(fPbx%QR?`#)*N&=Hf5OnurkAYM3@^v<;3Fh%%N*}(Dm{klf zla>4xbwX*-emb>{1|ApU@D>LDxPiXCiz;EgQAril;h+4Nq1ucy5T5C0uIR;?PguE^ zIW2!`%_r6E!jgE8uUp^2q6po+qf#yS zQAWN*8AId8kJ3){I0?jm;%}?)aJgfiWZhX=1fA$H$!}b4oloNNS?~8bi5%3tLGYi} zjQKoM=Sn`AUyX=jn$@>JE0e13=jnUSdF+~GnzhX7T(}uvpkGyZ7kMk zon(cjcYLP=vd|Sd>UGXMTWFog@{x(8N*Fe>I5~{t&yHlYZ9cO)9F(%WJG#K?60=Bi z`Ia1olh9UC9c7@XHiej}^l8kKoi3$@K`F|o?BoP|XqF7#tnXL9HDhH%yK`tVtU1oX z>R3%HYuMhQ?W?FDp5D+EuC-c-tAiUDOKlb3)i{nTpT!SYg4pxHBelTL%-w_J%!+DR#or&Az2ZIq@ARq#Z0C?e02N)a$u`|XZ5BvkdgMt&u z;hx@p{}#CaBZvVa|LWjF3D{8rJjsEcLFhA{USu!qUk2iT8PNYW09i494FHSPIG9#T z6RY7Y#;>UZ9Du**|8+JxSpM%(9efff9gGA4bTA);4hDnX`C{3|AB|$gysA#IpCx44 z)cy{a+R?8|?9SR7TJOao8G6(A*BLEYH318ds zGpZ)Nr5LM){+2nWj^BQkT=(}75BBXKL@)@cAe?{p?m~dqip%FSgp>1i31r3mD~R*h ztqmeAKBdoqRCMJ6k2%teDbBgru-aYHbw~8!#qCMu2iLg_p)ak3p2jzA@7vP)8RpxET~w8Gd+W;gaE(|^J656;a83~a zSao4Gipof(*7p4^LW~h+@{C-uQ3^U6 u=Y4|ex!K@;hfDFe9jB)G4MlxPULqI0$>&F0+9;UbO<1zo0k&Orfqw#)pyOiz literal 0 HcmV?d00001 diff --git a/Keystore Pass.rtf b/Keystore Pass.rtf new file mode 100644 index 00000000..cd33f08e --- /dev/null +++ b/Keystore Pass.rtf @@ -0,0 +1,9 @@ +{\rtf1\ansi\ansicpg1252\cocoartf2513 +\cocoatextscaling0\cocoaplatform0{\fonttbl\f0\fswiss\fcharset0 Helvetica;} +{\colortbl;\red255\green255\blue255;} +{\*\expandedcolortbl;;} +\paperw11900\paperh16840\margl1440\margr1440\vieww10800\viewh8400\viewkind0 +\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural\partightenfactor0 + +\f0\fs24 \cf0 keyPassword=HmGsa123\ +storePassword=HmGsa123} \ No newline at end of file diff --git a/key.properties b/key.properties new file mode 100644 index 00000000..01c8cbe8 --- /dev/null +++ b/key.properties @@ -0,0 +1,4 @@ +storePassword=HmGsa123 +keyPassword=HmGsa123 +keyAlias=DQKey +storeFile=DQKey.jks \ No newline at end of file diff --git a/lib/pages/MyAppointments/AppointmentDetails.dart b/lib/pages/MyAppointments/AppointmentDetails.dart index db2b0643..109af9d1 100644 --- a/lib/pages/MyAppointments/AppointmentDetails.dart +++ b/lib/pages/MyAppointments/AppointmentDetails.dart @@ -203,6 +203,7 @@ class _AppointmentDetailsState extends State MaterialPageRoute( builder: (context) => BookConfirm( doctor: getDoctorObject(), + isLiveCareAppointment: widget.appo.isLiveCareAppointment, selectedDate: DocAvailableAppointments.selectedDate, selectedTime: DocAvailableAppointments.selectedTime))); } diff --git a/lib/pages/landing/home_page.dart b/lib/pages/landing/home_page.dart index b2c421fe..3c353a80 100644 --- a/lib/pages/landing/home_page.dart +++ b/lib/pages/landing/home_page.dart @@ -42,13 +42,13 @@ class HomePage extends StatefulWidget { class _HomePageState extends State { ToDoCountProviderModel toDoProvider; - // @override - // void initState() { - // WidgetsBinding.instance.addPostFrameCallback((timeStamp) { - // getToDoCount(); - // }); - // super.initState(); - // } + @override + void initState() { + WidgetsBinding.instance.addPostFrameCallback((timeStamp) { + getToDoCount(); + }); + super.initState(); + } AuthenticatedUserObject authenticatedUserObject = locator(); From 0ac599ea1ca85187f22136a4b07e88a8810fae7c Mon Sep 17 00:00:00 2001 From: Mohammad Aljammal Date: Wed, 25 Nov 2020 14:38:58 +0200 Subject: [PATCH 2/8] fix vital Sign --- lib/core/service/client/base_app_client.dart | 4 ++++ lib/pages/landing/home_page.dart | 2 +- lib/widgets/drawer/app_drawer_widget.dart | 8 ++++++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/lib/core/service/client/base_app_client.dart b/lib/core/service/client/base_app_client.dart index 11095fd3..ff7e7776 100644 --- a/lib/core/service/client/base_app_client.dart +++ b/lib/core/service/client/base_app_client.dart @@ -2,6 +2,7 @@ import 'dart:convert'; import 'package:diplomaticquarterapp/config/config.dart'; import 'package:diplomaticquarterapp/config/shared_pref_kay.dart'; +import 'package:diplomaticquarterapp/core/service/medical/vital_sign_service.dart'; import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart'; import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart'; import 'package:diplomaticquarterapp/uitl/utils.dart'; @@ -23,6 +24,7 @@ AppSharedPreferences sharedPref = new AppSharedPreferences(); /// AuthenticatedUserObject authenticatedUserObject = locator(); +VitalSignService _vitalSignService = locator(); class BaseAppClient { post(String endPoint, @@ -165,6 +167,8 @@ class BaseAppClient { await sharedPref.remove(LOGIN_TOKEN_ID); await authenticatedUserObject.getUser(); Provider.of(AppGlobal.context, listen: false).isLogin = false; + _vitalSignService.weightKg =""; + _vitalSignService.heightCm=""; Navigator.of(AppGlobal.context).pushReplacementNamed(HOME); } diff --git a/lib/pages/landing/home_page.dart b/lib/pages/landing/home_page.dart index 3c353a80..6716535b 100644 --- a/lib/pages/landing/home_page.dart +++ b/lib/pages/landing/home_page.dart @@ -57,7 +57,7 @@ class _HomePageState extends State { ProjectViewModel projectViewModel = Provider.of(context); toDoProvider = Provider.of(context); return BaseView( - onModelReady: (model) => {},//model.getPatientRadOrders(), + onModelReady: (model) => model.getPatientRadOrders(), builder: (_, model, wi) => AppScaffold( isShowDecPage: false, body: Container( diff --git a/lib/widgets/drawer/app_drawer_widget.dart b/lib/widgets/drawer/app_drawer_widget.dart index f29ea4c6..f9658c02 100644 --- a/lib/widgets/drawer/app_drawer_widget.dart +++ b/lib/widgets/drawer/app_drawer_widget.dart @@ -1,6 +1,7 @@ import 'dart:io'; import 'package:diplomaticquarterapp/config/shared_pref_kay.dart'; import 'package:diplomaticquarterapp/core/service/AuthenticatedUserObject.dart'; +import 'package:diplomaticquarterapp/core/service/medical/vital_sign_service.dart'; import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart'; import 'package:diplomaticquarterapp/models/Authentication/authenticated_user.dart'; import 'package:diplomaticquarterapp/models/Authentication/check_activation_code_response.dart'; @@ -39,8 +40,9 @@ class _AppDrawerState extends State { var familyFileProvider = FamilyFilesProvider(); AuthenticatedUser user; AuthenticatedUser mainUser; - AuthenticatedUserObject authenticatedUserObject = - locator(); + AuthenticatedUserObject authenticatedUserObject = locator(); + VitalSignService _vitalSignService = locator(); + @override Widget build(BuildContext context) { @@ -408,6 +410,8 @@ class _AppDrawerState extends State { authenticatedUserObject.logout(); projectProvider.isLogin = false; await authenticatedUserObject.getUser(); + _vitalSignService.heightCm =""; + _vitalSignService.weightKg =""; await sharedPref.clear(); this.user = null; Navigator.of(context).pushNamed(HOME); From 6a14214a0f84af9838808246c72334fbd43c4d59 Mon Sep 17 00:00:00 2001 From: Sultan Khan Date: Wed, 25 Nov 2020 17:22:40 +0300 Subject: [PATCH 3/8] no message --- lib/pages/login/confirm-login.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/pages/login/confirm-login.dart b/lib/pages/login/confirm-login.dart index 229e0a0f..ba68b8f5 100644 --- a/lib/pages/login/confirm-login.dart +++ b/lib/pages/login/confirm-login.dart @@ -370,7 +370,7 @@ class _ConfirmLogin extends State { if (authenticated == true) { - if(user.logInType==2 || user.logInType ==3){ + if(user !=null && user.logInType==2 || user.logInType ==3){ this.checkActivationCode(); }else{ var request = this.getCommonRequest(type: type); From 1b678e0aca44ab588da2fd9fd1ded06949e71995 Mon Sep 17 00:00:00 2001 From: Sultan Khan Date: Wed, 25 Nov 2020 17:52:57 +0300 Subject: [PATCH 4/8] fingerprint --- lib/config/config.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/config/config.dart b/lib/config/config.dart index 58ade1bc..2592d1b2 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -7,8 +7,8 @@ import 'package:diplomaticquarterapp/widgets/mobile-no/mobile_no.dart'; const MAX_SMALL_SCREEN = 660; -const BASE_URL = 'https://uat.hmgwebservices.com/'; - //const BASE_URL = 'https://hmgwebservices.com/'; +//const BASE_URL = 'https://uat.hmgwebservices.com/'; + const BASE_URL = 'https://hmgwebservices.com/'; const GET_PROJECT = 'Services/Lists.svc/REST/GetProject'; ///Doctor From 7c33c06c0cb826952f5302a13445cd918287f6f4 Mon Sep 17 00:00:00 2001 From: Sultan Khan Date: Wed, 25 Nov 2020 17:53:22 +0300 Subject: [PATCH 5/8] fingerprint --- lib/pages/landing/landing_page.dart | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/lib/pages/landing/landing_page.dart b/lib/pages/landing/landing_page.dart index 8d522b1d..3f64afa3 100644 --- a/lib/pages/landing/landing_page.dart +++ b/lib/pages/landing/landing_page.dart @@ -147,7 +147,7 @@ class _LandingPageState extends State with WidgetsBindingObserver { _firebaseMessaging.getToken().then((String token) { sharedPref.setString(PUSH_TOKEN, token); - if (token != null && DEVICE_TOKEN == "") { + if (token != null) { DEVICE_TOKEN = token; checkUserStatus(token); } @@ -410,9 +410,7 @@ class _LandingPageState extends State with WidgetsBindingObserver { SETTINGS, ); else - Navigator.of(context).pushNamed( - WELCOME_LOGIN, - ); + login(); }, //do something, ) ], @@ -553,4 +551,15 @@ class _LandingPageState extends State with WidgetsBindingObserver { _changeCurrentTab(2); } } + login() async { + var data = await sharedPref.getObject(IMEI_USER_DATA); + sharedPref.remove(REGISTER_DATA_FOR_LOGIIN); + if (data != null) { + Navigator.of(context).pushNamed(CONFIRM_LOGIN); + } else { + Navigator.of(context).pushNamed( + WELCOME_LOGIN, + ); + } + } } From d6a0188c760a56c0423590e422f5e9f8f8b707f7 Mon Sep 17 00:00:00 2001 From: Sultan Khan Date: Wed, 25 Nov 2020 17:53:45 +0300 Subject: [PATCH 6/8] fingerprint --- lib/pages/login/confirm-login.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/pages/login/confirm-login.dart b/lib/pages/login/confirm-login.dart index ba68b8f5..87eaf1ce 100644 --- a/lib/pages/login/confirm-login.dart +++ b/lib/pages/login/confirm-login.dart @@ -370,7 +370,7 @@ class _ConfirmLogin extends State { if (authenticated == true) { - if(user !=null && user.logInType==2 || user.logInType ==3){ + if(user !=null && (user.logInType==2 || user.logInType ==3)){ this.checkActivationCode(); }else{ var request = this.getCommonRequest(type: type); From b504f379de03953a8f9b03dcaa0e834820dd90bf Mon Sep 17 00:00:00 2001 From: Mohammad Aljammal Date: Wed, 25 Nov 2020 17:11:53 +0200 Subject: [PATCH 7/8] fix lab result translations and colors --- lib/config/localized_values.dart | 24 ++ lib/pages/medical/labs/labs_home_page.dart | 4 +- .../radiology/radiology_home_page.dart | 1 + lib/uitl/translations_delegate_base.dart | 8 + .../data_display/medical/LabResultWidget.dart | 19 +- .../data_display/medical/doctor_card.dart | 69 +++-- .../medical/laboratory_result_widget.dart | 263 +++++++++--------- 7 files changed, 221 insertions(+), 167 deletions(-) diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index b75baf2e..b1ed5307 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -999,4 +999,28 @@ const Map localizedValues = { "searchItemError": {"en": "Item name should be more than 3 character ", "ar": "يجب أن يكون اسم العنصر أكثر من 3 أحرف"}, "YouCanFind": {"en": "YouCanFind", "ar": "باستطاعتك العثور على "}, "ItemInSearch": {"en": " Item In Search", "ar": " عنصر في البحث "}, + "InvoiceNo": {"en": " Invoice No", "ar": "رقم الفاتورة"}, + "SpecialResult": {"en": " Special Result", "ar": "نتيجة خاصة"}, + "GeneralResult": {"en": "General Result", "ar": "نتيجة عامة"}, + "show-more-btn": { + "en": "Flow Chart", + "ar": "النتائج التراكمية" + }, + + "value": { + "en": "Value", + "ar": "القيمة" + }, + "range": { + "en": "Range", + "ar": "المدى" + }, + "out-patient": { + "en": "Out Patient", + "ar": "عيادات خارجية" + }, + "in-patient": { + "en": "In Patient", + "ar": "تنويم" + } }; diff --git a/lib/pages/medical/labs/labs_home_page.dart b/lib/pages/medical/labs/labs_home_page.dart index 68dc180e..f459a057 100644 --- a/lib/pages/medical/labs/labs_home_page.dart +++ b/lib/pages/medical/labs/labs_home_page.dart @@ -40,7 +40,7 @@ class LabsHomePage extends StatelessWidget { leading: Radio( value: FilterType.Clinic, groupValue: model.filterType, - activeColor: Colors.red[800], + activeColor: Theme.of(context).primaryColor, onChanged: (FilterType value) { model.setFilterType(value); }, @@ -57,7 +57,7 @@ class LabsHomePage extends StatelessWidget { leading: Radio( value: FilterType.Hospital, groupValue: model.filterType, - activeColor: Colors.red[800], + activeColor: Theme.of(context).primaryColor, onChanged: (FilterType value) => model.setFilterType(value), ), diff --git a/lib/pages/medical/radiology/radiology_home_page.dart b/lib/pages/medical/radiology/radiology_home_page.dart index 995ac485..a7c4fcc5 100644 --- a/lib/pages/medical/radiology/radiology_home_page.dart +++ b/lib/pages/medical/radiology/radiology_home_page.dart @@ -85,6 +85,7 @@ class RadiologyHomePage extends StatelessWidget { ), ), child: DoctorCard( + isInOutPatient: radiology.isInOutPatient, name: radiology.doctorName, profileUrl: radiology.doctorImageURL, subName: '${radiology.projectName} \n${TranslationBase.of(context).billNo} ${radiology.invoiceNo}', diff --git a/lib/uitl/translations_delegate_base.dart b/lib/uitl/translations_delegate_base.dart index c5fc8852..12c7ff6e 100644 --- a/lib/uitl/translations_delegate_base.dart +++ b/lib/uitl/translations_delegate_base.dart @@ -855,6 +855,14 @@ String get fileno => localizedValues['fileno'][locale.languageCode]; String get searchItemError => localizedValues['searchItemError'][locale.languageCode]; String get youCanFind => localizedValues['YouCanFind'][locale.languageCode]; String get itemInSearch => localizedValues['ItemInSearch'][locale.languageCode]; + String get invoiceNo => localizedValues['InvoiceNo'][locale.languageCode]; + String get specialResult => localizedValues['SpecialResult'][locale.languageCode]; + String get generalResult => localizedValues['GeneralResult'][locale.languageCode]; + String get showMoreBtn => localizedValues['show-more-btn'][locale.languageCode]; + String get value => localizedValues['value'][locale.languageCode]; + String get range => localizedValues['range'][locale.languageCode]; + String get outpatient => localizedValues['out-patient'][locale.languageCode]; + String get inPatient => localizedValues['in-patient'][locale.languageCode]; } diff --git a/lib/widgets/data_display/medical/LabResultWidget.dart b/lib/widgets/data_display/medical/LabResultWidget.dart index 225b4076..6ad51c36 100644 --- a/lib/widgets/data_display/medical/LabResultWidget.dart +++ b/lib/widgets/data_display/medical/LabResultWidget.dart @@ -1,5 +1,6 @@ import 'package:diplomaticquarterapp/core/model/labs/lab_result.dart'; import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart'; +import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; @@ -32,7 +33,7 @@ class LabResultWidget extends StatelessWidget { //TODO model.getPatientLabResult(patientLabOrder: widget.patientLabOrder); }, child: Texts( - 'Flow Chart', + TranslationBase.of(context).showMoreBtn, decoration: TextDecoration.underline, color: Colors.blue, ), @@ -44,13 +45,13 @@ class LabResultWidget extends StatelessWidget { inside: BorderSide( width: 2.0, color: Colors.grey[300]), ), - children: fullData(patientLabResultList), + children: fullData(patientLabResultList,context), ), ], ), ); } - List fullData(List labResultList) { + List fullData(List labResultList,context) { List tableRow = []; tableRow.add( TableRow( @@ -58,7 +59,7 @@ class LabResultWidget extends StatelessWidget { Container( child: Container( decoration: BoxDecoration( - color: Color(0xff515B5D), + color: Theme.of(context).primaryColor, borderRadius: BorderRadius.only( topLeft: projectViewModel.isArabic ? Radius.circular(0.0) @@ -70,7 +71,7 @@ class LabResultWidget extends StatelessWidget { ), child: Center( child: Texts( - 'Description', + TranslationBase.of(context).description, color: Colors.white, ), ), @@ -80,17 +81,17 @@ class LabResultWidget extends StatelessWidget { Container( child: Container( decoration: BoxDecoration( - color: Color(0xff515B5D), + color: Theme.of(context).primaryColor, ), child: Center( - child: Texts('Value', color: Colors.white), + child: Texts(TranslationBase.of(context).value, color: Colors.white), ), height: 60), ), Container( child: Container( decoration: BoxDecoration( - color: Color(0xff515B5D), + color: Theme.of(context).primaryColor, borderRadius: BorderRadius.only( topLeft: projectViewModel.isArabic ? Radius.circular(10.0) @@ -101,7 +102,7 @@ class LabResultWidget extends StatelessWidget { ), ), child: Center( - child: Texts('Range', color: Colors.white), + child: Texts(TranslationBase.of(context).range, color: Colors.white), ), height: 60), ), diff --git a/lib/widgets/data_display/medical/doctor_card.dart b/lib/widgets/data_display/medical/doctor_card.dart index 4fdaa1ab..732a8934 100644 --- a/lib/widgets/data_display/medical/doctor_card.dart +++ b/lib/widgets/data_display/medical/doctor_card.dart @@ -1,3 +1,5 @@ +import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart'; +import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/widgets/avatar/large_avatar.dart'; import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:diplomaticquarterapp/widgets/others/StarRating.dart'; @@ -5,6 +7,7 @@ import 'package:diplomaticquarterapp/widgets/others/rounded_container_widget.dar import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; +import 'package:provider/provider.dart'; class DoctorCard extends StatelessWidget { final String name; @@ -26,22 +29,22 @@ class DoctorCard extends StatelessWidget { this.billNo, this.onTap, this.onEmailTap, - this.isInOutPatient}); + this.isInOutPatient}); @override Widget build(BuildContext context) { + ProjectViewModel projectViewModel = Provider.of(context); return Container( margin: EdgeInsets.all(10), decoration: BoxDecoration( - border: Border.all( - width: 0.5, - color: Theme.of(context).primaryColor, - ), - borderRadius: BorderRadius.all( - Radius.circular(8.0), - ), - color: Colors.white - ), + border: Border.all( + width: 0.5, + color: Theme.of(context).primaryColor, + ), + borderRadius: BorderRadius.all( + Radius.circular(8.0), + ), + color: Colors.white), child: InkWell( onTap: onTap, child: Column( @@ -50,18 +53,34 @@ class DoctorCard extends StatelessWidget { Row( children: [ Container( - width: 20, - height: date == null ? 100 : 130, + width:projectViewModel.isArabic? 27:20, + height: date == null ? projectViewModel.isArabic? 170 :100 : 150, decoration: BoxDecoration( - color: !isInOutPatient? Colors.red[900]: Theme.of(context).primaryColor, - borderRadius: BorderRadius.only( - topLeft: Radius.circular(8), - bottomLeft: Radius.circular(8))), + color: !isInOutPatient + ? Colors.red[900] + : Theme.of(context).primaryColor, + borderRadius: BorderRadius.only( + topLeft: projectViewModel.isArabic + ? Radius.circular(0) + : Radius.circular(8), + bottomLeft: projectViewModel.isArabic + ? Radius.circular(0) + : Radius.circular(8), + topRight: projectViewModel.isArabic? Radius.circular(8):Radius.circular(0), + bottomRight: projectViewModel.isArabic? Radius.circular(8):Radius.circular(0), + ), + ), child: RotatedBox( quarterTurns: 3, child: Center( child: Text( - !isInOutPatient? 'In Patient'.toUpperCase():'OutPatient'.toUpperCase(), + !isInOutPatient + ? TranslationBase.of(context) + .inPatient + .toUpperCase() + : TranslationBase.of(context) + .outpatient + .toUpperCase(), style: TextStyle(color: Colors.white), ), )), @@ -116,14 +135,14 @@ class DoctorCard extends StatelessWidget { ), ), ), - if(onEmailTap!=null) - InkWell( - onTap: onEmailTap, - child: Icon( - Icons.email, - color: Colors.red, - ), - ) + if (onEmailTap != null) + InkWell( + onTap: onEmailTap, + child: Icon( + Icons.email, + color: Colors.red, + ), + ) ], ), ), diff --git a/lib/widgets/data_display/medical/laboratory_result_widget.dart b/lib/widgets/data_display/medical/laboratory_result_widget.dart index f763def1..d16019b6 100644 --- a/lib/widgets/data_display/medical/laboratory_result_widget.dart +++ b/lib/widgets/data_display/medical/laboratory_result_widget.dart @@ -3,6 +3,8 @@ import 'package:diplomaticquarterapp/core/model/labs/patient_lab_orders.dart'; import 'package:diplomaticquarterapp/core/viewModels/medical/labs_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart'; import 'package:diplomaticquarterapp/pages/base/base_view.dart'; +import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; +import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'package:diplomaticquarterapp/widgets/others/network_base_view.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; @@ -41,139 +43,139 @@ class _LaboratoryResultWidgetState extends State { @override Widget build(BuildContext context) { projectViewModel = Provider.of(context); - return Container( - margin: EdgeInsets.all(15), - child: Column( - children: [ - Column( - crossAxisAlignment: CrossAxisAlignment.start, + return BaseView( + onModelReady: (model) => + model.getPatientLabResult(patientLabOrder: widget.patientLabOrder), + builder: (_, model, w) => NetworkBaseView( + baseViewModel: model, + child: Container( + margin: EdgeInsets.all(15), + child: Column( children: [ - Container( - margin: EdgeInsets.all(15), - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - Expanded( - child: Container( - decoration: BoxDecoration( - shape: BoxShape.rectangle, - color: Colors.white, - borderRadius: BorderRadius.all( - Radius.circular(5.0), - )), - padding: EdgeInsets.all(10.0), - margin: EdgeInsets.only(left: 5, right: 5), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Texts('Invoice No'), - Texts(widget.billNo), - ], - ), - ), - ), - InkWell( - onTap: widget.onTap, - child: Container( - margin: EdgeInsets.only(left: 5, right: 5), - decoration: BoxDecoration( - shape: BoxShape.rectangle, - color: Colors.red[800], - borderRadius: BorderRadius.all( - Radius.circular(5.0), - )), - child: Container( - padding: EdgeInsets.all(10.0), - child: Column( - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - Icon( - Icons.email, - color: Colors.white, - ), - Texts( - 'Send a copy', + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + margin: EdgeInsets.all(15), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Expanded( + child: Container( + decoration: BoxDecoration( + shape: BoxShape.rectangle, color: Colors.white, - ) - ], + borderRadius: BorderRadius.all( + Radius.circular(5.0), + )), + padding: EdgeInsets.all(10.0), + margin: EdgeInsets.only(left: 5, right: 5), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Texts(TranslationBase.of(context).invoiceNo), + Texts(widget.billNo), + ], + ), ), ), + InkWell( + onTap: widget.onTap, + child: Container( + margin: EdgeInsets.only(left: 5, right: 5), + decoration: BoxDecoration( + shape: BoxShape.rectangle, + color: Theme.of(context).primaryColor, + borderRadius: BorderRadius.all( + Radius.circular(5.0), + )), + child: Container( + padding: EdgeInsets.all(10.0), + child: Column( + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Icon( + Icons.email, + color: Colors.white, + ), + Texts( + TranslationBase.of(context).sendCopy, + color: Colors.white, + ) + ], + ), + ), + ), + ) + ], + ), + ), + SizedBox( + height: 10, + ), + InkWell( + onTap: () { + setState(() { + _isShowMore = !_isShowMore; + }); + }, + child: Container( + padding: EdgeInsets.all(10.0), + margin: EdgeInsets.only(left: 5, right: 5), + decoration: BoxDecoration( + shape: BoxShape.rectangle, + color: Colors.white, + borderRadius: BorderRadius.all( + Radius.circular(5.0), + )), + child: Row( + children: [ + Expanded(child: Texts(TranslationBase.of(context).specialResult)), + Container( + width: 25, + height: 25, + decoration: BoxDecoration( + shape: BoxShape.circle, color: Theme.of(context).primaryColor), + child: Icon( + _isShowMore + ? Icons.keyboard_arrow_up + : Icons.keyboard_arrow_down, + color: Colors.white, + size: 22, + ), + ) + ], ), - ) - ], - ), - ), - SizedBox( - height: 10, - ), - InkWell( - onTap: () { - setState(() { - _isShowMore = !_isShowMore; - }); - }, - child: Container( - padding: EdgeInsets.all(10.0), - margin: EdgeInsets.only(left: 5, right: 5), - decoration: BoxDecoration( - shape: BoxShape.rectangle, - color: Colors.white, - borderRadius: BorderRadius.all( - Radius.circular(5.0), - )), - child: Row( - children: [ - Expanded(child: Texts('Special Result')), - Container( - width: 25, - height: 25, - decoration: BoxDecoration( - shape: BoxShape.circle, color: Colors.red[900]), - child: Icon( - _isShowMore - ? Icons.keyboard_arrow_up - : Icons.keyboard_arrow_down, + ), + ), + if (_isShowMore) + AnimatedContainer( + padding: EdgeInsets.all(10.0), + margin: EdgeInsets.only(left: 5, right: 5), + decoration: BoxDecoration( + shape: BoxShape.rectangle, color: Colors.white, - size: 22, - ), - ) - ], + borderRadius: BorderRadius.only( + bottomLeft: Radius.circular(5.0), + bottomRight: Radius.circular(5.0), + )), + duration: Duration(milliseconds: 7000), + child: Container( + width: double.infinity, + child: Html( + data: widget.details ?? 'No Data', + )), + ), + SizedBox( + height: 12, ), - ), - ), - if (_isShowMore) - AnimatedContainer( - padding: EdgeInsets.all(10.0), - margin: EdgeInsets.only(left: 5, right: 5), - decoration: BoxDecoration( - shape: BoxShape.rectangle, - color: Colors.white, - borderRadius: BorderRadius.only( - bottomLeft: Radius.circular(5.0), - bottomRight: Radius.circular(5.0), - )), - duration: Duration(milliseconds: 7000), - child: Container( - width: double.infinity, - child: Html( - data: widget.details ?? 'No Data', - )), - ), - SizedBox( - height: 12, - ), - BaseView( - onModelReady: (model) => model.getPatientLabResult( - patientLabOrder: widget.patientLabOrder), - builder: (_, model, w) => NetworkBaseView( - baseViewModel: model, - child: Container( + Container( child: Column( children: [ InkWell( onTap: () { setState( - () { + () { _isShowMoreGeneral = !_isShowMoreGeneral; }, ); @@ -189,13 +191,13 @@ class _LaboratoryResultWidgetState extends State { )), child: Row( children: [ - Expanded(child: Texts('General Result')), + Expanded(child: Texts(TranslationBase.of(context).generalResult)), Container( width: 25, height: 25, decoration: BoxDecoration( shape: BoxShape.circle, - color: Colors.red[900]), + color: Theme.of(context).primaryColor), child: Icon( _isShowMoreGeneral ? Icons.keyboard_arrow_up @@ -224,11 +226,12 @@ class _LaboratoryResultWidgetState extends State { child: Container( width: double.infinity, child: Column( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: + CrossAxisAlignment.start, children: [ ...List.generate( model.labResultLists.length, - (index) => LabResultWidget( + (index) => LabResultWidget( filterName: model .labResultLists[index].filterName, patientLabResultList: model @@ -242,15 +245,13 @@ class _LaboratoryResultWidgetState extends State { ), ], ), - ), - ), - ) + ) + ], + ), ], ), - ], + ), ), ); } - - } From 5bb780c4ac83316abcaeccb8b7b8b84291cf3520 Mon Sep 17 00:00:00 2001 From: Sultan Khan Date: Thu, 26 Nov 2020 09:43:51 +0300 Subject: [PATCH 8/8] push --- lib/pages/landing/landing_page.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/pages/landing/landing_page.dart b/lib/pages/landing/landing_page.dart index 3f64afa3..826c8b76 100644 --- a/lib/pages/landing/landing_page.dart +++ b/lib/pages/landing/landing_page.dart @@ -145,9 +145,9 @@ class _LandingPageState extends State with WidgetsBindingObserver { _firebaseMessaging.requestNotificationPermissions(); } - _firebaseMessaging.getToken().then((String token) { + _firebaseMessaging.getToken().then((String token) async { sharedPref.setString(PUSH_TOKEN, token); - if (token != null) { + if (token != null && await sharedPref.getObject(USER_PROFILE) ==null) { DEVICE_TOKEN = token; checkUserStatus(token); }