From 230ebaf445657d47aaa8bff9b3bdd6add49dd511 Mon Sep 17 00:00:00 2001 From: Elham Rababh Date: Tue, 26 Oct 2021 15:30:06 +0300 Subject: [PATCH] operation report --- .../operation_report/operation_report.dart | 42 +++++++------------ 1 file changed, 14 insertions(+), 28 deletions(-) diff --git a/lib/screens/patients/profile/operation_report/operation_report.dart b/lib/screens/patients/profile/operation_report/operation_report.dart index e02bb191..0db74f42 100644 --- a/lib/screens/patients/profile/operation_report/operation_report.dart +++ b/lib/screens/patients/profile/operation_report/operation_report.dart @@ -68,27 +68,6 @@ class _ProgressNoteState extends State { color: Colors.grey[200], child: Column( children: [ - AddNewOrder( - onTap: () async { - await locator().logEvent( - eventCategory: "Operation Report Screen", - eventAction: "Update Operation Report ", - ); - Navigator.push( - context, - MaterialPageRoute( - builder: (context) => UpdateOperationReport( - operationReportViewModel: model, - patient: patient, - visitType: widget.visitType, - isUpdate: false, - ), - settings: RouteSettings(name: 'UpdateNoteOrder'), - ), - ); - }, - label: TranslationBase.of(context).operationReports, - ), model.operationReportList == null || model.operationReportList.length == 0 ? DrAppEmbeddedError( @@ -234,13 +213,12 @@ class _ProgressNoteState extends State { ), ) ]), - if (model.operationReportList[index] - .timeStart != + .timeStart != null) Row( mainAxisAlignment: - MainAxisAlignment.start, + MainAxisAlignment.start, children: [ AppText( "Operation Time Start : ", @@ -248,7 +226,9 @@ class _ProgressNoteState extends State { ), Expanded( child: AppText( - model.operationReportList[index] + model + .operationReportList[ + index] .timeStart, fontSize: 10, ), @@ -297,7 +277,14 @@ class _ProgressNoteState extends State { MainAxisAlignment.end, children: [ InkWell( - onTap: () { + onTap: () async { + await locator() + .logEvent( + eventCategory: + "Operation Report Screen", + eventAction: + "Update Operation Report ", + ); Navigator.push( context, MaterialPageRoute( @@ -332,8 +319,7 @@ class _ProgressNoteState extends State { width: 2, ), AppText( - TranslationBase.of(context) - .update, + "Operation Reports", fontSize: 10, color: Colors.white, ),