Minor fixes in Eye Measurements

merge-requests/390/head
haroon amjad 4 years ago
parent 120e6c166d
commit d4a4165ef3

@ -418,7 +418,7 @@ const Map localizedValues = {
"PleaseEnterTheVerificationCode": {"en": "Please enter the verification code send to", "ar": "الرجاء إدخال رمز التحقق المرسل إلى"}, "PleaseEnterTheVerificationCode": {"en": "Please enter the verification code send to", "ar": "الرجاء إدخال رمز التحقق المرسل إلى"},
"EyeMeasurements": {"en": "Eye Measurements", "ar": "قياسات النظر"}, "EyeMeasurements": {"en": "Eye Measurements", "ar": "قياسات النظر"},
"Measurements": {"en": "Measurements", "ar": "قياسات"}, "Measurements": {"en": "Measurements", "ar": "قياسات"},
"Classes": {"en": "Classes", "ar": "نظارات"}, "Classes": {"en": "Glasses", "ar": "نظارات"},
"ContactLens": {"en": "Contact Lens", "ar": "العدسات اللاصقة"}, "ContactLens": {"en": "Contact Lens", "ar": "العدسات اللاصقة"},
"RightEye": {"en": "Right Eye", "ar": "العين اليمين"}, "RightEye": {"en": "Right Eye", "ar": "العين اليمين"},
"Sphere": {"en": "Sphere", "ar": "القوة"}, "Sphere": {"en": "Sphere", "ar": "القوة"},

@ -12,11 +12,10 @@ class DashboardViewModel extends BaseViewModel {
String get heightCm => _vitalSignService.heightCm; String get heightCm => _vitalSignService.heightCm;
String booldType = "-"; String booldType = "-";
DashboardViewModel() { DashboardViewModel() {
this.getPatientRadOrders(); // this.getPatientRadOrders();
} }
// ToDoCountProviderModel toDoProvider =
// Provider.of<ToDoCountProviderModel>(AppGlobal.context);
getPatientRadOrders() async { getPatientRadOrders() async {
if (isLogin && _vitalSignService.weightKg.isEmpty) { 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);
// });
// }
} }

@ -1,13 +1,7 @@
import 'package:diplomaticquarterapp/core/model/eye/AppoimentAllHistoryResult.dart'; 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/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/uitl/utils_new.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/dialogs/confirm_send_email_dialog.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@ -135,7 +129,7 @@ class ClassesPage extends StatelessWidget {
mainAxisAlignment: MainAxisAlignment.spaceAround, mainAxisAlignment: MainAxisAlignment.spaceAround,
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ 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( Expanded(
flex: 2, flex: 2,
child: Row( child: Row(
@ -143,11 +137,11 @@ class ClassesPage extends StatelessWidget {
children: [ children: [
Text( Text(
val1 == 'null' ? '-' : val1, val1 == 'null' ? '-' : val1,
style: TextStyle(fontSize: 10, fontWeight: FontWeight.w600, letterSpacing: -0.4), style: TextStyle(fontSize: 11, fontWeight: FontWeight.w600, letterSpacing: -0.4),
), ),
Text( Text(
val2 != 'null' ? '-' : val2, val2 != 'null' ? '-' : val2,
style: TextStyle(fontSize: 10, fontWeight: FontWeight.w600, letterSpacing: -0.4), style: TextStyle(fontSize: 11, fontWeight: FontWeight.w600, letterSpacing: -0.4),
), ),
], ],
), ),

@ -142,7 +142,7 @@ class ContactLensPage extends StatelessWidget {
flex: 4, flex: 4,
child: Text( child: Text(
title, title,
style: TextStyle(fontSize: 10, fontWeight: FontWeight.w600, letterSpacing: -0.4), style: TextStyle(fontSize: 11, fontWeight: FontWeight.w600, letterSpacing: -0.4),
)), )),
Expanded( Expanded(
flex: 2, flex: 2,
@ -152,7 +152,7 @@ class ContactLensPage extends StatelessWidget {
children: [ children: [
Text( Text(
val1 == 'null' ? '-' : val1, val1 == 'null' ? '-' : val1,
style: TextStyle(fontSize: 10, fontWeight: FontWeight.w600, letterSpacing: -0.4), style: TextStyle(fontSize: 11, fontWeight: FontWeight.w600, letterSpacing: -0.4),
), ),
], ],
), ),

@ -120,7 +120,7 @@ class _EyeHomePageState extends State<EyeHomePage> with SingleTickerProviderStat
TranslationBase.of(context).classes, TranslationBase.of(context).classes,
style: TextStyle( style: TextStyle(
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
fontSize: 12, // fontSize: 12,
letterSpacing: -0.36, letterSpacing: -0.36,
), ),
), ),
@ -133,7 +133,7 @@ class _EyeHomePageState extends State<EyeHomePage> with SingleTickerProviderStat
TranslationBase.of(context).contactLens, TranslationBase.of(context).contactLens,
style: TextStyle( style: TextStyle(
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
fontSize: 12, // fontSize: 12,
letterSpacing: -0.36, letterSpacing: -0.36,
), ),
), ),

Loading…
Cancel
Save