From d4a4165ef3abf3591c60fbb61d72b371ed8d75f7 Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Wed, 8 Sep 2021 12:48:16 +0300 Subject: [PATCH] Minor fixes in Eye Measurements --- lib/config/localized_values.dart | 2 +- lib/core/viewModels/dashboard_view_model.dart | 18 ++---------------- lib/pages/medical/eye/ClassesPage.dart | 12 +++--------- lib/pages/medical/eye/ContactLensPage.dart | 4 ++-- lib/pages/medical/eye/EyeHomePage.dart | 4 ++-- 5 files changed, 10 insertions(+), 30 deletions(-) diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index 67f4bb2d..f7967492 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -418,7 +418,7 @@ const Map localizedValues = { "PleaseEnterTheVerificationCode": {"en": "Please enter the verification code send to", "ar": "الرجاء إدخال رمز التحقق المرسل إلى"}, "EyeMeasurements": {"en": "Eye Measurements", "ar": "قياسات النظر"}, "Measurements": {"en": "Measurements", "ar": "قياسات"}, - "Classes": {"en": "Classes", "ar": "نظارات"}, + "Classes": {"en": "Glasses", "ar": "نظارات"}, "ContactLens": {"en": "Contact Lens", "ar": "العدسات اللاصقة"}, "RightEye": {"en": "Right Eye", "ar": "العين اليمين"}, "Sphere": {"en": "Sphere", "ar": "القوة"}, diff --git a/lib/core/viewModels/dashboard_view_model.dart b/lib/core/viewModels/dashboard_view_model.dart index cd34fd70..c2211993 100644 --- a/lib/core/viewModels/dashboard_view_model.dart +++ b/lib/core/viewModels/dashboard_view_model.dart @@ -12,11 +12,10 @@ class DashboardViewModel extends BaseViewModel { String get heightCm => _vitalSignService.heightCm; String booldType = "-"; + DashboardViewModel() { - this.getPatientRadOrders(); + // this.getPatientRadOrders(); } - // ToDoCountProviderModel toDoProvider = - // Provider.of(AppGlobal.context); getPatientRadOrders() async { if (isLogin && _vitalSignService.weightKg.isEmpty) { @@ -31,17 +30,4 @@ class DashboardViewModel extends BaseViewModel { } } } - -// getToDoCount() { -// toDoProvider.setState(0); -// ClinicListService service = new ClinicListService(); -// service.getActiveAppointmentNo(AppGlobal.context).then((res) { -// print(res['AppointmentActiveNumber']); -// if (res['MessageStatus'] == 1) { -// toDoProvider.setState(res['AppointmentActiveNumber']); -// } else {} -// }).catchError((err) { -// print(err); -// }); -// } } diff --git a/lib/pages/medical/eye/ClassesPage.dart b/lib/pages/medical/eye/ClassesPage.dart index 273a8088..563a7ce3 100644 --- a/lib/pages/medical/eye/ClassesPage.dart +++ b/lib/pages/medical/eye/ClassesPage.dart @@ -1,13 +1,7 @@ import 'package:diplomaticquarterapp/core/model/eye/AppoimentAllHistoryResult.dart'; -import 'package:diplomaticquarterapp/core/viewModels/medical/EyeViewModel.dart'; -import 'package:diplomaticquarterapp/pages/base/base_view.dart'; -import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/uitl/utils_new.dart'; -import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart'; -import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:diplomaticquarterapp/widgets/dialogs/confirm_send_email_dialog.dart'; -import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; @@ -135,7 +129,7 @@ class ClassesPage extends StatelessWidget { mainAxisAlignment: MainAxisAlignment.spaceAround, crossAxisAlignment: CrossAxisAlignment.start, children: [ - Expanded(flex: 4, child: Text(title,style: TextStyle(fontSize: 10, fontWeight: FontWeight.w600, letterSpacing: -0.4),)), + Expanded(flex: 4, child: Text(title,style: TextStyle(fontSize: 11, fontWeight: FontWeight.w600, letterSpacing: -0.4))), Expanded( flex: 2, child: Row( @@ -143,11 +137,11 @@ class ClassesPage extends StatelessWidget { children: [ Text( val1 == 'null' ? '-' : val1, - style: TextStyle(fontSize: 10, fontWeight: FontWeight.w600, letterSpacing: -0.4), + style: TextStyle(fontSize: 11, fontWeight: FontWeight.w600, letterSpacing: -0.4), ), Text( val2 != 'null' ? '-' : val2, - style: TextStyle(fontSize: 10, fontWeight: FontWeight.w600, letterSpacing: -0.4), + style: TextStyle(fontSize: 11, fontWeight: FontWeight.w600, letterSpacing: -0.4), ), ], ), diff --git a/lib/pages/medical/eye/ContactLensPage.dart b/lib/pages/medical/eye/ContactLensPage.dart index ae00dbfd..feaabc8c 100644 --- a/lib/pages/medical/eye/ContactLensPage.dart +++ b/lib/pages/medical/eye/ContactLensPage.dart @@ -142,7 +142,7 @@ class ContactLensPage extends StatelessWidget { flex: 4, child: Text( title, - style: TextStyle(fontSize: 10, fontWeight: FontWeight.w600, letterSpacing: -0.4), + style: TextStyle(fontSize: 11, fontWeight: FontWeight.w600, letterSpacing: -0.4), )), Expanded( flex: 2, @@ -152,7 +152,7 @@ class ContactLensPage extends StatelessWidget { children: [ Text( val1 == 'null' ? '-' : val1, - style: TextStyle(fontSize: 10, fontWeight: FontWeight.w600, letterSpacing: -0.4), + style: TextStyle(fontSize: 11, fontWeight: FontWeight.w600, letterSpacing: -0.4), ), ], ), diff --git a/lib/pages/medical/eye/EyeHomePage.dart b/lib/pages/medical/eye/EyeHomePage.dart index de5c7cba..00111283 100644 --- a/lib/pages/medical/eye/EyeHomePage.dart +++ b/lib/pages/medical/eye/EyeHomePage.dart @@ -120,7 +120,7 @@ class _EyeHomePageState extends State with SingleTickerProviderStat TranslationBase.of(context).classes, style: TextStyle( fontWeight: FontWeight.w600, - fontSize: 12, + // fontSize: 12, letterSpacing: -0.36, ), ), @@ -133,7 +133,7 @@ class _EyeHomePageState extends State with SingleTickerProviderStat TranslationBase.of(context).contactLens, style: TextStyle( fontWeight: FontWeight.w600, - fontSize: 12, + // fontSize: 12, letterSpacing: -0.36, ), ),