Merge branch 'lap_result_fix' into 'development'

fix lap result special

See merge request Cloud_Solution/doctor_app_flutter!876
merge-requests/877/merge
Elham Ali 4 years ago
commit 75e944427c

@ -1,5 +1,5 @@
class AllSpecialLabResultModel {
int actualDoctorRate;
dynamic actualDoctorRate;
dynamic admissionDate;
dynamic admissionNumber;
dynamic appointmentDate;

@ -3,6 +3,7 @@ import 'package:doctor_app_flutter/core/viewModel/project_view_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/patients/profile/lab_result/special_lab_result_details_page.dart';
import 'package:doctor_app_flutter/util/date-utils.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-app-bar.dart';
import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
@ -174,7 +175,9 @@ class _AllLabSpecialResultState extends State<AllLabSpecialResult> {
clinic: model
.allSpecialLabList[index].clinicDescription,
appointmentDate:
model.allSpecialLabList[index].orderDate,
AppDateUtils.getDateTimeFromServerFormat(
model.allSpecialLabList[index].createdOn,
),
orderNo: model.allSpecialLabList[index].orderNo,
isShowTime: false,
),

@ -692,7 +692,7 @@ packages:
name: meta
url: "https://pub.dartlang.org"
source: hosted
version: "1.3.0-nullsafety.3"
version: "1.3.0-nullsafety.4"
mime:
dependency: transitive
description:
@ -1026,7 +1026,7 @@ packages:
name: stack_trace
url: "https://pub.dartlang.org"
source: hosted
version: "1.10.0-nullsafety.1"
version: "1.10.0-nullsafety.2"
sticky_headers:
dependency: "direct main"
description:
@ -1231,5 +1231,5 @@ packages:
source: hosted
version: "2.2.1"
sdks:
dart: ">=2.10.2 <2.11.0"
dart: ">=2.10.2 <=2.11.0-213.1.beta"
flutter: ">=1.22.2 <2.0.0"

Loading…
Cancel
Save