Merge branch 'fixes_nov' into 'development'

fix operation reports

See merge request Cloud_Solution/doctor_app_flutter!903
merge-requests/904/merge
Elham Ali 4 years ago
commit b3bfda9128

@ -719,4 +719,23 @@ const Map<String, Map<String, String>> localizedValues = {
"healthID": {"en": "Health ID", "ar": "معرف الصحة"}, "healthID": {"en": "Health ID", "ar": "معرف الصحة"},
"identityNumber": {"en": "Identity Number", "ar": "رقم الهوية"}, "identityNumber": {"en": "Identity Number", "ar": "رقم الهوية"},
"maritalStatus": {"en": "Marital Status", "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": "مساعد"},
}; };

@ -74,32 +74,6 @@ class _ProgressNoteState extends State<OperationReportScreen> {
error: TranslationBase.of(context).noDataAvailable, ), error: TranslationBase.of(context).noDataAvailable, ),
): Column( ): Column(
children: [ 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( Expanded(
child: Container( child: Container(
child: ListView.builder( child: ListView.builder(
@ -219,7 +193,7 @@ class _ProgressNoteState extends State<OperationReportScreen> {
MainAxisAlignment.start, MainAxisAlignment.start,
children: [ children: [
AppText( AppText(
"Reservation: ", TranslationBase.of(context).reservation,
fontSize: 10, fontSize: 10,
), ),
Expanded( Expanded(
@ -240,7 +214,7 @@ class _ProgressNoteState extends State<OperationReportScreen> {
MainAxisAlignment.start, MainAxisAlignment.start,
children: [ children: [
AppText( AppText(
"Operation Date : ", TranslationBase.of(context).operationDate,
fontSize: 10, fontSize: 10,
), ),
Expanded( Expanded(
@ -267,7 +241,7 @@ class _ProgressNoteState extends State<OperationReportScreen> {
MainAxisAlignment.start, MainAxisAlignment.start,
children: [ children: [
AppText( AppText(
"Operation Time Start : ", TranslationBase.of(context).operationTimeStart ,
fontSize: 10, fontSize: 10,
), ),
Expanded( Expanded(
@ -288,7 +262,7 @@ class _ProgressNoteState extends State<OperationReportScreen> {
MainAxisAlignment.start, MainAxisAlignment.start,
children: [ children: [
AppText( AppText(
"Remarks : ", TranslationBase.of(context).remarks,
fontSize: 10, fontSize: 10,
), ),
Expanded( Expanded(
@ -363,7 +337,7 @@ class _ProgressNoteState extends State<OperationReportScreen> {
width: 2, width: 2,
), ),
AppText( AppText(
"Operation Reports", TranslationBase.of(context).operationReports,
fontSize: 10, fontSize: 10,
color: Colors.white, color: Colors.white,
), ),

@ -156,8 +156,7 @@ class _UpdateOperationReportState extends State<UpdateOperationReport> {
child: Column( child: Column(
children: [ children: [
AppTextFieldCustom( AppTextFieldCustom(
hintText: "Reservation No", hintText:TranslationBase.of(context).reservation,
//TranslationBase.of(context).addoperationReports,
controller: OTReservationID, controller: OTReservationID,
maxLines: 1, maxLines: 1,
minLines: 1, minLines: 1,
@ -168,11 +167,10 @@ class _UpdateOperationReportState extends State<UpdateOperationReport> {
height: 4, height: 4,
), ),
AppTextFieldCustom( AppTextFieldCustom(
hintText: "Pre Op Diagmosis", hintText:TranslationBase.of(context).preOperationDiagnosis,
//TranslationBase.of(context).addoperationReports,
controller: preOpDiagmosisController, controller: preOpDiagmosisController,
maxLines: 1, maxLines: 20,
minLines: 1, minLines: 8,
hasBorder: true, hasBorder: true,
// isTextFieldHasSuffix: true, // isTextFieldHasSuffix: true,
@ -187,13 +185,11 @@ class _UpdateOperationReportState extends State<UpdateOperationReport> {
height: 4, height: 4,
), ),
AppTextFieldCustom( AppTextFieldCustom(
hintText: "Post Op Diagmosis", hintText: TranslationBase.of(context).postOperationDiagnosis,
//TranslationBase.of(context).addoperationReports,
controller: postOpDiagmosisNoteController, controller: postOpDiagmosisNoteController,
maxLines: 1, maxLines: 20,
minLines: 1, minLines: 8,
hasBorder: true, hasBorder: true,
// isTextFieldHasSuffix: true, // isTextFieldHasSuffix: true,
validationError: validationError:
postOpDiagmosisNoteController postOpDiagmosisNoteController
@ -207,13 +203,11 @@ class _UpdateOperationReportState extends State<UpdateOperationReport> {
height: 4, height: 4,
), ),
AppTextFieldCustom( AppTextFieldCustom(
hintText: "Surgeon", hintText: TranslationBase.of(context).surgeon,
//TranslationBase.of(context).addoperationReports,
controller: surgeonController, controller: surgeonController,
maxLines: 1, maxLines: 1,
minLines: 1, minLines: 1,
hasBorder: true, hasBorder: true,
// isTextFieldHasSuffix: true, // isTextFieldHasSuffix: true,
validationError: validationError:
surgeonController.text.isEmpty && surgeonController.text.isEmpty &&
@ -226,8 +220,7 @@ class _UpdateOperationReportState extends State<UpdateOperationReport> {
height: 4, height: 4,
), ),
AppTextFieldCustom( AppTextFieldCustom(
hintText: "assistant", hintText:TranslationBase.of(context).assistant,
//TranslationBase.of(context).addoperationReports,
controller: assistantNoteController, controller: assistantNoteController,
maxLines: 1, maxLines: 1,
minLines: 1, minLines: 1,
@ -245,11 +238,11 @@ class _UpdateOperationReportState extends State<UpdateOperationReport> {
height: 4, height: 4,
), ),
AppTextFieldCustom( AppTextFieldCustom(
hintText: "Operation", hintText:
//TranslationBase.of(context).addoperationReports, TranslationBase.of(context).operation,
controller: operationController, controller: operationController,
maxLines: 1, maxLines: 20,
minLines: 1, minLines: 4,
hasBorder: true, hasBorder: true,
// isTextFieldHasSuffix: true, // isTextFieldHasSuffix: true,
@ -283,11 +276,10 @@ class _UpdateOperationReportState extends State<UpdateOperationReport> {
height: 4, height: 4,
), ),
AppTextFieldCustom( AppTextFieldCustom(
hintText: "finding", hintText: TranslationBase.of(context).finding,
//TranslationBase.of(context).addoperationReports,
controller: findingController, controller: findingController,
maxLines: 1, maxLines: 20,
minLines: 1, minLines: 4,
hasBorder: true, hasBorder: true,
// isTextFieldHasSuffix: true, // isTextFieldHasSuffix: true,
@ -302,11 +294,10 @@ class _UpdateOperationReportState extends State<UpdateOperationReport> {
height: 4, height: 4,
), ),
AppTextFieldCustom( AppTextFieldCustom(
hintText: "Surgery Procedure", hintText: TranslationBase.of(context).surgeryProcedure,
//TranslationBase.of(context).addoperationReports,
controller: surgeryProcedureController, controller: surgeryProcedureController,
maxLines: 1, maxLines: 20,
minLines: 1, minLines: 8,
hasBorder: true, hasBorder: true,
// isTextFieldHasSuffix: true, // isTextFieldHasSuffix: true,
@ -322,11 +313,10 @@ class _UpdateOperationReportState extends State<UpdateOperationReport> {
height: 4, height: 4,
), ),
AppTextFieldCustom( AppTextFieldCustom(
hintText: "Post Op Instruction", hintText: TranslationBase.of(context).postOperationInstruction,
//TranslationBase.of(context).addoperationReports,
controller: postOpInstructionController, controller: postOpInstructionController,
maxLines: 1, maxLines: 20,
minLines: 1, minLines: 8,
hasBorder: true, hasBorder: true,
// isTextFieldHasSuffix: true, // isTextFieldHasSuffix: true,
@ -342,13 +332,11 @@ class _UpdateOperationReportState extends State<UpdateOperationReport> {
height: 4, height: 4,
), ),
AppTextFieldCustom( AppTextFieldCustom(
hintText: "Complication Details", hintText: TranslationBase.of(context).complicationDetails1,
//TranslationBase.of(context).addoperationReports,
controller: complicationDetailsController, controller: complicationDetailsController,
maxLines: 1, maxLines: 20,
minLines: 1, minLines: 4,
hasBorder: true, hasBorder: true,
// isTextFieldHasSuffix: true, // isTextFieldHasSuffix: true,
validationError: validationError:
complicationDetailsController complicationDetailsController
@ -362,11 +350,10 @@ class _UpdateOperationReportState extends State<UpdateOperationReport> {
height: 4, height: 4,
), ),
AppTextFieldCustom( AppTextFieldCustom(
hintText: "Blood Loss Detail", hintText: TranslationBase.of(context).bloodLossDetail,
//TranslationBase.of(context).addoperationReports,
controller: bloodLossDetailController, controller: bloodLossDetailController,
maxLines: 1, maxLines: 20,
minLines: 1, minLines: 4,
hasBorder: true, hasBorder: true,
// isTextFieldHasSuffix: true, // isTextFieldHasSuffix: true,
@ -381,11 +368,10 @@ class _UpdateOperationReportState extends State<UpdateOperationReport> {
height: 4, height: 4,
), ),
AppTextFieldCustom( AppTextFieldCustom(
hintText: "histopal the Specimen", hintText: TranslationBase.of(context).histopathSpecimen,
//TranslationBase.of(context).addoperationReports,
controller: histopathSpecimenController, controller: histopathSpecimenController,
maxLines: 1, maxLines: 20,
minLines: 1, minLines: 4,
hasBorder: true, hasBorder: true,
// isTextFieldHasSuffix: true, // isTextFieldHasSuffix: true,
@ -401,12 +387,11 @@ class _UpdateOperationReportState extends State<UpdateOperationReport> {
height: 4, height: 4,
), ),
AppTextFieldCustom( AppTextFieldCustom(
hintText: "microbiology Specimen ", hintText: TranslationBase.of(context).microbiologySpecimen,
//TranslationBase.of(context).addoperationReports,
controller: controller:
microbiologySpecimenController, microbiologySpecimenController,
maxLines: 1, maxLines: 20,
minLines: 1, minLines: 4,
hasBorder: true, hasBorder: true,
// isTextFieldHasSuffix: true, // isTextFieldHasSuffix: true,
@ -422,11 +407,10 @@ class _UpdateOperationReportState extends State<UpdateOperationReport> {
height: 4, height: 4,
), ),
AppTextFieldCustom( AppTextFieldCustom(
hintText: "other Specimen", hintText: TranslationBase.of(context).otherSpecimen,
//TranslationBase.of(context).addoperationReports,
controller: otherSpecimenController, controller: otherSpecimenController,
maxLines: 1, maxLines: 20,
minLines: 1, minLines: 4,
hasBorder: true, hasBorder: true,
// isTextFieldHasSuffix: true, // isTextFieldHasSuffix: true,
@ -441,8 +425,7 @@ class _UpdateOperationReportState extends State<UpdateOperationReport> {
height: 4, height: 4,
), ),
AppTextFieldCustom( AppTextFieldCustom(
hintText: "scrub Nurse", hintText: TranslationBase.of(context).scrubNurse,
//TranslationBase.of(context).addoperationReports,
controller: scrubNurseController, controller: scrubNurseController,
maxLines: 1, maxLines: 1,
minLines: 1, minLines: 1,
@ -460,8 +443,7 @@ class _UpdateOperationReportState extends State<UpdateOperationReport> {
height: 4, height: 4,
), ),
AppTextFieldCustom( AppTextFieldCustom(
hintText: "circulating Nurse", hintText:TranslationBase.of(context).circulatingNurse,
//TranslationBase.of(context).addoperationReports,
controller: circulatingNurseController, controller: circulatingNurseController,
maxLines: 1, maxLines: 1,
minLines: 1, minLines: 1,
@ -480,12 +462,11 @@ class _UpdateOperationReportState extends State<UpdateOperationReport> {
height: 4, height: 4,
), ),
AppTextFieldCustom( AppTextFieldCustom(
hintText: "Blood Transfused Detail", hintText: TranslationBase.of(context).bloodTransfusedDetail,
//TranslationBase.of(context).addoperationReports,
controller: controller:
BloodTransfusedDetailController, BloodTransfusedDetailController,
maxLines: 1, maxLines: 20,
minLines: 1, minLines: 4,
hasBorder: true, hasBorder: true,
// isTextFieldHasSuffix: true, // isTextFieldHasSuffix: true,
@ -501,8 +482,7 @@ class _UpdateOperationReportState extends State<UpdateOperationReport> {
height: 4, height: 4,
), ),
AppTextFieldCustom( AppTextFieldCustom(
hintText: "Anasthetist", hintText: TranslationBase.of(context).anesthetist,
//TranslationBase.of(context).addoperationReports,
controller: anasthetistController, controller: anasthetistController,
maxLines: 1, maxLines: 1,
minLines: 1, minLines: 1,
@ -540,7 +520,7 @@ class _UpdateOperationReportState extends State<UpdateOperationReport> {
child: AppButton( child: AppButton(
title: (widget.isUpdate title: (widget.isUpdate
? TranslationBase.of(context).noteUpdate ? TranslationBase.of(context).noteUpdate
: TranslationBase.of(context).noteAdd) + : TranslationBase.of(context).noteAdd) +" "+
TranslationBase.of(context).operationReports, TranslationBase.of(context).operationReports,
color: Color(0xff359846), color: Color(0xff359846),
// disabled: operationReportsController.text.isEmpty, // disabled: operationReportsController.text.isEmpty,
@ -608,7 +588,6 @@ class _UpdateOperationReportState extends State<UpdateOperationReport> {
DrAppToastMsg.showSuccesToast( DrAppToastMsg.showSuccesToast(
"Your Order added Successfully"); "Your Order added Successfully");
Navigator.of(context).pop();
} }
GifLoaderDialogUtils.hideDialog(context); GifLoaderDialogUtils.hideDialog(context);
} }

@ -1114,7 +1114,25 @@ class TranslationBase {
String get notReplied => localizedValues['notReplied'][locale.languageCode]; String get notReplied => localizedValues['notReplied'][locale.languageCode];
String get registerNewPatient => localizedValues['registerNewPatient'][locale.languageCode]; String get registerNewPatient => localizedValues['registerNewPatient'][locale.languageCode];
String get registeraPatient => localizedValues['registeraPatient'][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<TranslationBase> { class TranslationBaseDelegate extends LocalizationsDelegate<TranslationBase> {

@ -1,7 +1,9 @@
import 'package:doctor_app_flutter/config/config.dart'; 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:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:provider/provider.dart';
import 'app-textfield-custom.dart'; import 'app-textfield-custom.dart';
@ -35,6 +37,7 @@ class AppTextFieldCustomSearch extends StatelessWidget {
final List<TextInputFormatter> inputFormatters; final List<TextInputFormatter> inputFormatters;
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
ProjectViewModel projectViewModel = Provider.of(context);
return Container( return Container(
margin: EdgeInsets.only(left: 16, right: 16, bottom: 16, top: marginTop), margin: EdgeInsets.only(left: 16, right: 16, bottom: 16, top: marginTop),
child: Stack( child: Stack(
@ -58,7 +61,7 @@ class AppTextFieldCustomSearch extends StatelessWidget {
onFieldSubmitted: onFieldSubmitted, onFieldSubmitted: onFieldSubmitted,
validationError: validationError), validationError: validationError),
if (positionedChild != null) 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)
], ],
), ),
); );

Loading…
Cancel
Save