diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index 51b2e2c1..6a536fae 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -719,4 +719,23 @@ const Map> localizedValues = { "healthID": {"en": "Health ID", "ar": "معرف الصحة"}, "identityNumber": {"en": "Identity Number", "ar": "رقم الهوية"}, "maritalStatus": {"en": "Marital Status", "ar": "الحالة الزوجية"}, + "operationTimeStart": {"en": "Operation Time Start :", "ar": "بدء وقت العملية:"}, + "operationDate": {"en": "operation Date :", "ar": "تاريخ العملية:"}, + "reservation": {"en": "Reservation Number :", "ar": " رقم الحجز :"}, + "anesthetist": {"en": "Anesthetist", "ar": "طبيب تخدير "}, + "bloodTransfusedDetail": {"en": "blood Transfused Detail", "ar": "تفاصيل نقل الدم "}, + "circulatingNurse": {"en": "circulating Nurse", "ar": "ممرضة عمومية"}, + "scrubNurse": {"en": "Scrub Nurse", "ar": "ممرضة تدليك"}, + "otherSpecimen": {"en": "Other Specimen", "ar": "عينة أخرى"}, + "microbiologySpecimen": {"en": "Microbiology Specimen", "ar": "عينة علم الأحياء الدقيقة"}, + "histopathSpecimen": {"en": "Histopath Specimen", "ar": "عينة الأنسجة"}, + "bloodLossDetail": {"en": "Blood Loss Detail", "ar": "تفاصيل فقدان الدم"}, + "complicationDetails1": {"en": "Complication Details", "ar": "تفاصيل المضاعفات"}, + "postOperationInstruction": {"en": "Post Operation Instruction", "ar": "تعليمات ما بعد العملية"}, + "surgeryProcedure": {"en": "Surgery Procedures", "ar": "إجراءات الجراحة"}, + "finding": {"en": "Finding", "ar": "العثور على"}, + "preOperationDiagnosis": {"en": "Pre OperationOperation Diagnosis", "ar": "التشخيص قبل العملية"}, + "postOperationDiagnosis": {"en": "Post Operation Diagnosis", "ar": "تشخيص ما بعد العملية"}, + "surgeon": {"en": "surgeon", "ar": "دكتور جراح"}, + "assistant": {"en": "assistant", "ar": "مساعد"}, }; diff --git a/lib/screens/patients/profile/operation_report/operation_report.dart b/lib/screens/patients/profile/operation_report/operation_report.dart index 34b43315..6d912c3f 100644 --- a/lib/screens/patients/profile/operation_report/operation_report.dart +++ b/lib/screens/patients/profile/operation_report/operation_report.dart @@ -74,32 +74,6 @@ class _ProgressNoteState extends State { error: TranslationBase.of(context).noDataAvailable, ), ): Column( children: [ - Padding( - padding: const EdgeInsets.all(8.0), - child: Column( - children: [ - Row( - children: [ - AppText( - TranslationBase.of(context).operation, - fontSize: 15.0, - fontWeight: FontWeight.w600, - fontFamily: 'Poppins', - ), - ], - ), - Row( - children: [ - AppText( - TranslationBase.of(context).reports, - fontSize: 25.0, - fontWeight: FontWeight.w700, - ), - ], - ), - ], - ), - ), Expanded( child: Container( child: ListView.builder( @@ -219,7 +193,7 @@ class _ProgressNoteState extends State { MainAxisAlignment.start, children: [ AppText( - "Reservation: ", + TranslationBase.of(context).reservation, fontSize: 10, ), Expanded( @@ -240,7 +214,7 @@ class _ProgressNoteState extends State { MainAxisAlignment.start, children: [ AppText( - "Operation Date : ", + TranslationBase.of(context).operationDate, fontSize: 10, ), Expanded( @@ -267,7 +241,7 @@ class _ProgressNoteState extends State { MainAxisAlignment.start, children: [ AppText( - "Operation Time Start : ", + TranslationBase.of(context).operationTimeStart , fontSize: 10, ), Expanded( @@ -288,7 +262,7 @@ class _ProgressNoteState extends State { MainAxisAlignment.start, children: [ AppText( - "Remarks : ", + TranslationBase.of(context).remarks, fontSize: 10, ), Expanded( @@ -363,7 +337,7 @@ class _ProgressNoteState extends State { width: 2, ), AppText( - "Operation Reports", + TranslationBase.of(context).operationReports, fontSize: 10, color: Colors.white, ), diff --git a/lib/screens/patients/profile/operation_report/update_operation_report.dart b/lib/screens/patients/profile/operation_report/update_operation_report.dart index d042ff2f..28141d45 100644 --- a/lib/screens/patients/profile/operation_report/update_operation_report.dart +++ b/lib/screens/patients/profile/operation_report/update_operation_report.dart @@ -156,8 +156,7 @@ class _UpdateOperationReportState extends State { child: Column( children: [ AppTextFieldCustom( - hintText: "Reservation No", - //TranslationBase.of(context).addoperationReports, + hintText:TranslationBase.of(context).reservation, controller: OTReservationID, maxLines: 1, minLines: 1, @@ -168,11 +167,10 @@ class _UpdateOperationReportState extends State { height: 4, ), AppTextFieldCustom( - hintText: "Pre Op Diagmosis", - //TranslationBase.of(context).addoperationReports, + hintText:TranslationBase.of(context).preOperationDiagnosis, controller: preOpDiagmosisController, - maxLines: 1, - minLines: 1, + maxLines: 20, + minLines: 8, hasBorder: true, // isTextFieldHasSuffix: true, @@ -187,13 +185,11 @@ class _UpdateOperationReportState extends State { height: 4, ), AppTextFieldCustom( - hintText: "Post Op Diagmosis", - //TranslationBase.of(context).addoperationReports, + hintText: TranslationBase.of(context).postOperationDiagnosis, controller: postOpDiagmosisNoteController, - maxLines: 1, - minLines: 1, + maxLines: 20, + minLines: 8, hasBorder: true, - // isTextFieldHasSuffix: true, validationError: postOpDiagmosisNoteController @@ -207,13 +203,11 @@ class _UpdateOperationReportState extends State { height: 4, ), AppTextFieldCustom( - hintText: "Surgeon", - //TranslationBase.of(context).addoperationReports, + hintText: TranslationBase.of(context).surgeon, controller: surgeonController, maxLines: 1, minLines: 1, hasBorder: true, - // isTextFieldHasSuffix: true, validationError: surgeonController.text.isEmpty && @@ -226,8 +220,7 @@ class _UpdateOperationReportState extends State { height: 4, ), AppTextFieldCustom( - hintText: "assistant", - //TranslationBase.of(context).addoperationReports, + hintText:TranslationBase.of(context).assistant, controller: assistantNoteController, maxLines: 1, minLines: 1, @@ -245,11 +238,11 @@ class _UpdateOperationReportState extends State { height: 4, ), AppTextFieldCustom( - hintText: "Operation", - //TranslationBase.of(context).addoperationReports, + hintText: + TranslationBase.of(context).operation, controller: operationController, - maxLines: 1, - minLines: 1, + maxLines: 20, + minLines: 4, hasBorder: true, // isTextFieldHasSuffix: true, @@ -283,11 +276,10 @@ class _UpdateOperationReportState extends State { height: 4, ), AppTextFieldCustom( - hintText: "finding", - //TranslationBase.of(context).addoperationReports, + hintText: TranslationBase.of(context).finding, controller: findingController, - maxLines: 1, - minLines: 1, + maxLines: 20, + minLines: 4, hasBorder: true, // isTextFieldHasSuffix: true, @@ -302,11 +294,10 @@ class _UpdateOperationReportState extends State { height: 4, ), AppTextFieldCustom( - hintText: "Surgery Procedure", - //TranslationBase.of(context).addoperationReports, + hintText: TranslationBase.of(context).surgeryProcedure, controller: surgeryProcedureController, - maxLines: 1, - minLines: 1, + maxLines: 20, + minLines: 8, hasBorder: true, // isTextFieldHasSuffix: true, @@ -322,11 +313,10 @@ class _UpdateOperationReportState extends State { height: 4, ), AppTextFieldCustom( - hintText: "Post Op Instruction", - //TranslationBase.of(context).addoperationReports, + hintText: TranslationBase.of(context).postOperationInstruction, controller: postOpInstructionController, - maxLines: 1, - minLines: 1, + maxLines: 20, + minLines: 8, hasBorder: true, // isTextFieldHasSuffix: true, @@ -342,13 +332,11 @@ class _UpdateOperationReportState extends State { height: 4, ), AppTextFieldCustom( - hintText: "Complication Details", - //TranslationBase.of(context).addoperationReports, + hintText: TranslationBase.of(context).complicationDetails1, controller: complicationDetailsController, - maxLines: 1, - minLines: 1, + maxLines: 20, + minLines: 4, hasBorder: true, - // isTextFieldHasSuffix: true, validationError: complicationDetailsController @@ -362,11 +350,10 @@ class _UpdateOperationReportState extends State { height: 4, ), AppTextFieldCustom( - hintText: "Blood Loss Detail", - //TranslationBase.of(context).addoperationReports, + hintText: TranslationBase.of(context).bloodLossDetail, controller: bloodLossDetailController, - maxLines: 1, - minLines: 1, + maxLines: 20, + minLines: 4, hasBorder: true, // isTextFieldHasSuffix: true, @@ -381,11 +368,10 @@ class _UpdateOperationReportState extends State { height: 4, ), AppTextFieldCustom( - hintText: "histopal the Specimen", - //TranslationBase.of(context).addoperationReports, + hintText: TranslationBase.of(context).histopathSpecimen, controller: histopathSpecimenController, - maxLines: 1, - minLines: 1, + maxLines: 20, + minLines: 4, hasBorder: true, // isTextFieldHasSuffix: true, @@ -401,12 +387,11 @@ class _UpdateOperationReportState extends State { height: 4, ), AppTextFieldCustom( - hintText: "microbiology Specimen ", - //TranslationBase.of(context).addoperationReports, + hintText: TranslationBase.of(context).microbiologySpecimen, controller: microbiologySpecimenController, - maxLines: 1, - minLines: 1, + maxLines: 20, + minLines: 4, hasBorder: true, // isTextFieldHasSuffix: true, @@ -422,11 +407,10 @@ class _UpdateOperationReportState extends State { height: 4, ), AppTextFieldCustom( - hintText: "other Specimen", - //TranslationBase.of(context).addoperationReports, + hintText: TranslationBase.of(context).otherSpecimen, controller: otherSpecimenController, - maxLines: 1, - minLines: 1, + maxLines: 20, + minLines: 4, hasBorder: true, // isTextFieldHasSuffix: true, @@ -441,8 +425,7 @@ class _UpdateOperationReportState extends State { height: 4, ), AppTextFieldCustom( - hintText: "scrub Nurse", - //TranslationBase.of(context).addoperationReports, + hintText: TranslationBase.of(context).scrubNurse, controller: scrubNurseController, maxLines: 1, minLines: 1, @@ -460,8 +443,7 @@ class _UpdateOperationReportState extends State { height: 4, ), AppTextFieldCustom( - hintText: "circulating Nurse", - //TranslationBase.of(context).addoperationReports, + hintText:TranslationBase.of(context).circulatingNurse, controller: circulatingNurseController, maxLines: 1, minLines: 1, @@ -480,12 +462,11 @@ class _UpdateOperationReportState extends State { height: 4, ), AppTextFieldCustom( - hintText: "Blood Transfused Detail", - //TranslationBase.of(context).addoperationReports, + hintText: TranslationBase.of(context).bloodTransfusedDetail, controller: BloodTransfusedDetailController, - maxLines: 1, - minLines: 1, + maxLines: 20, + minLines: 4, hasBorder: true, // isTextFieldHasSuffix: true, @@ -501,8 +482,7 @@ class _UpdateOperationReportState extends State { height: 4, ), AppTextFieldCustom( - hintText: "Anasthetist", - //TranslationBase.of(context).addoperationReports, + hintText: TranslationBase.of(context).anesthetist, controller: anasthetistController, maxLines: 1, minLines: 1, @@ -540,7 +520,7 @@ class _UpdateOperationReportState extends State { child: AppButton( title: (widget.isUpdate ? TranslationBase.of(context).noteUpdate - : TranslationBase.of(context).noteAdd) + + : TranslationBase.of(context).noteAdd) +" "+ TranslationBase.of(context).operationReports, color: Color(0xff359846), // disabled: operationReportsController.text.isEmpty, @@ -608,7 +588,6 @@ class _UpdateOperationReportState extends State { DrAppToastMsg.showSuccesToast( "Your Order added Successfully"); - Navigator.of(context).pop(); } GifLoaderDialogUtils.hideDialog(context); } diff --git a/lib/util/translations_delegate_base.dart b/lib/util/translations_delegate_base.dart index 647cf39f..d6410f5e 100644 --- a/lib/util/translations_delegate_base.dart +++ b/lib/util/translations_delegate_base.dart @@ -1114,7 +1114,25 @@ class TranslationBase { String get notReplied => localizedValues['notReplied'][locale.languageCode]; String get registerNewPatient => localizedValues['registerNewPatient'][locale.languageCode]; String get registeraPatient => localizedValues['registeraPatient'][locale.languageCode]; - + String get operationTimeStart => localizedValues['operationTimeStart'][locale.languageCode]; + String get operationDate => localizedValues['operationDate'][locale.languageCode]; + String get reservation => localizedValues['reservation'][locale.languageCode]; + String get anesthetist => localizedValues['anesthetist'][locale.languageCode]; + String get bloodTransfusedDetail => localizedValues['bloodTransfusedDetail'][locale.languageCode]; + String get circulatingNurse => localizedValues['circulatingNurse'][locale.languageCode]; + String get scrubNurse => localizedValues['scrubNurse'][locale.languageCode]; + String get otherSpecimen => localizedValues['otherSpecimen'][locale.languageCode]; + String get microbiologySpecimen => localizedValues['microbiologySpecimen'][locale.languageCode]; + String get histopathSpecimen => localizedValues['histopathSpecimen'][locale.languageCode]; + String get bloodLossDetail => localizedValues['bloodLossDetail'][locale.languageCode]; + String get complicationDetails1 => localizedValues['complicationDetails1'][locale.languageCode]; + String get postOperationInstruction => localizedValues['postOperationInstruction'][locale.languageCode]; + String get surgeryProcedure => localizedValues['surgeryProcedure'][locale.languageCode]; + String get finding => localizedValues['finding'][locale.languageCode]; + String get preOperationDiagnosis => localizedValues['preOperationDiagnosis'][locale.languageCode]; + String get postOperationDiagnosis => localizedValues['postOperationDiagnosis'][locale.languageCode]; + String get surgeon => localizedValues['surgeon'][locale.languageCode]; + String get assistant => localizedValues['assistant'][locale.languageCode]; } class TranslationBaseDelegate extends LocalizationsDelegate { diff --git a/lib/widgets/shared/text_fields/app_text_field_custom_serach.dart b/lib/widgets/shared/text_fields/app_text_field_custom_serach.dart index 2a5304e2..46fa78d1 100644 --- a/lib/widgets/shared/text_fields/app_text_field_custom_serach.dart +++ b/lib/widgets/shared/text_fields/app_text_field_custom_serach.dart @@ -1,7 +1,9 @@ import 'package:doctor_app_flutter/config/config.dart'; +import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; +import 'package:provider/provider.dart'; import 'app-textfield-custom.dart'; @@ -35,6 +37,7 @@ class AppTextFieldCustomSearch extends StatelessWidget { final List inputFormatters; @override Widget build(BuildContext context) { + ProjectViewModel projectViewModel = Provider.of(context); return Container( margin: EdgeInsets.only(left: 16, right: 16, bottom: 16, top: marginTop), child: Stack( @@ -58,7 +61,7 @@ class AppTextFieldCustomSearch extends StatelessWidget { onFieldSubmitted: onFieldSubmitted, validationError: validationError), if (positionedChild != null) - Positioned(right: 35, top: 5, child: positionedChild) + projectViewModel.isArabic?Positioned(left: 35, top: 5, child: positionedChild):Positioned(right: 35, top: 5, child: positionedChild) ], ), );