Merge branch 'fix-issues' into 'development'

Fix issues

See merge request Cloud_Solution/doctor_app_flutter!440
merge-requests/441/merge
Mohammad Aljammal 5 years ago
commit 96b27fb884

@ -1,8 +1,10 @@
import 'package:doctor_app_flutter/core/viewModel/medical_file_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/medical_file_view_model.dart';
import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart';
import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart'; import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart';
import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart';
import 'package:doctor_app_flutter/screens/base/base_view.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart';
import 'package:doctor_app_flutter/screens/patients/profile/patient_profile_screen.dart'; import 'package:doctor_app_flutter/screens/patients/profile/patient_profile_screen.dart';
import 'package:doctor_app_flutter/util/date-utils.dart';
import 'package:doctor_app_flutter/util/helpers.dart'; import 'package:doctor_app_flutter/util/helpers.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart';
@ -14,6 +16,7 @@ import 'package:doctor_app_flutter/widgets/shared/expandable-widget-header-body.
import 'package:doctor_app_flutter/widgets/shared/network_base_view.dart'; import 'package:doctor_app_flutter/widgets/shared/network_base_view.dart';
import 'package:eva_icons_flutter/eva_icons_flutter.dart'; import 'package:eva_icons_flutter/eva_icons_flutter.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
class MedicalFileDetails extends StatefulWidget { class MedicalFileDetails extends StatefulWidget {
String age; String age;
@ -69,6 +72,7 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
ProjectViewModel projectViewModel = Provider.of(context);
return BaseView<MedicalFileViewModel>( return BaseView<MedicalFileViewModel>(
onModelReady: (model) => model.getMedicalFile(mrn: pp), onModelReady: (model) => model.getMedicalFile(mrn: pp),
builder: builder:
@ -184,7 +188,7 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
TranslationBase.of(context) TranslationBase.of(context)
.episode + .episode +
": ", ": ",
fontWeight: FontWeight.w700, //fontWeight: FontWeight.w700,
), ),
if (model.medicalFileList.length != if (model.medicalFileList.length !=
0 && 0 &&
@ -216,7 +220,7 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
TranslationBase.of(context) TranslationBase.of(context)
.visitDate + .visitDate +
": ", ": ",
fontWeight: FontWeight.w700, //fontWeight: FontWeight.w700,
), ),
if (model.medicalFileList.length != if (model.medicalFileList.length !=
0 && 0 &&
@ -230,15 +234,17 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
.length != .length !=
0) 0)
AppText( AppText(
model '${DateUtils.getDayMonthYearDateFormatted(DateUtils.getDateTimeFromServerFormat(
.medicalFileList[0] model
.entityList[0] .medicalFileList[0]
.timelines[encounterNumber] .entityList[0]
.timeLineEvents[0] .timelines[
.consulations[0] encounterNumber]
.appointmentDate .date,
.toString(), ), isArabic: projectViewModel.isArabic)}',
color: Colors.black,
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
fontSize: 14,
), ),
SizedBox(width: 35.0), SizedBox(width: 35.0),
// AppText( // AppText(

Loading…
Cancel
Save