Haroon6138
/
doctor_app_flutter
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

add rich editor for MedicalReportPage

Browse Source
merge-requests/676/head
Elham Rababah 3 years ago
parent 5b94a19b60
commit 342477beda
4 changed files with 16 additions and 143 deletions
Show Stats Download Patch File Download Diff File

153
lib/screens/patients/profile/medical_report/AddVerifyMedicalReport.dart
Unescape Escape View File

@ -3,7 +3,7 @@ import 'package:doctor_app_flutter/core/enum/viewstate.dart';
import 'package:doctor_app_flutter/core/provider/robot_provider.dart'; import 'package:doctor_app_flutter/core/provider/robot_provider.dart';
import 'package:doctor_app_flutter/core/viewModel/PatientMedicalReportViewModel.dart'; import 'package:doctor_app_flutter/core/viewModel/PatientMedicalReportViewModel.dart';
import 'package:doctor_app_flutter/core/viewModel/project_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/models/patient/MedicalReport/MeidcalReportModel.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/util/dr_app_toast_msg.dart'; import 'package:doctor_app_flutter/util/dr_app_toast_msg.dart';
@ -12,13 +12,13 @@ import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/loader/gif_loader_dialog_utils.dart'; import 'package:doctor_app_flutter/widgets/shared/loader/gif_loader_dialog_utils.dart';
import 'package:doctor_app_flutter/widgets/shared/speech-text-popup.dart'; import 'package:doctor_app_flutter/widgets/shared/speech-text-popup.dart';
import 'package:doctor_app_flutter/widgets/shared/text_fields/app-textfield-custom.dart'; import 'package:doctor_app_flutter/widgets/shared/text_fields/html_rich_editor.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:html_editor_enhanced/html_editor.dart';
import 'package:permission_handler/permission_handler.dart'; import 'package:permission_handler/permission_handler.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:speech_to_text/speech_recognition_error.dart'; import 'package:speech_to_text/speech_recognition_error.dart';
import 'package:speech_to_text/speech_to_text.dart' as stt; import 'package:speech_to_text/speech_to_text.dart' as stt;
import 'package:doctor_app_flutter/models/patient/MedicalReport/MeidcalReportModel.dart';
class AddVerifyMedicalReport extends StatefulWidget { class AddVerifyMedicalReport extends StatefulWidget {
@override @override
@ -72,8 +72,6 @@ class _AddVerifyMedicalReportState extends State<AddVerifyMedicalReport> {
? routeArgs['medicalReport'] ? routeArgs['medicalReport']
: null; : null;
// model.medicalReportTemplate[0].templateTextHtml
return BaseView<PatientMedicalReportViewModel>( return BaseView<PatientMedicalReportViewModel>(
onModelReady: (model) => model.getMedicalReportTemplate(), onModelReady: (model) => model.getMedicalReportTemplate(),
builder: (_, model, w) => AppScaffold( builder: (_, model, w) => AppScaffold(
@ -96,117 +94,9 @@ class _AddVerifyMedicalReportState extends State<AddVerifyMedicalReport> {
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Stack( HtmlRichEditor(initialText: model
children: [ .medicalReportTemplate[0]
AppTextFieldCustom( .templateTextHtml, height: MediaQuery.of(context).size.height * 0.75,),
hintText: TranslationBase.of(context)
.historyPhysicalFinding,
controller: historyFindingController,
maxLines: 15,
minLines: 10,
hasBorder: true,
validationError: commentsError,
),
Positioned(
top: -2,
//MediaQuery.of(context).size.height * 0,
right: projectViewModel.isArabic
? MediaQuery.of(context)
.size
.width *
0.75
: 15,
child: Column(
children: [
IconButton(
icon: Icon(
DoctorApp.speechtotext,
color: Colors.black,
size: 35),
onPressed: () {
initSpeechState().then(
(value) =>
{onVoiceText()});
},
),
],
)),
],
),
Stack(
children: [
AppTextFieldCustom(
hintText: TranslationBase.of(context)
.laboratoryPhysicalData,
controller: laboratoryDataController,
maxLines: 15,
minLines: 10,
hasBorder: true,
validationError: comments2Error,
),
Positioned(
top: -2,
//MediaQuery.of(context).size.height * 0,
right: projectViewModel.isArabic
? MediaQuery.of(context)
.size
.width *
0.75
: 15,
child: Column(
children: [
IconButton(
icon: Icon(
DoctorApp.speechtotext,
color: Colors.black,
size: 35),
onPressed: () {
initSpeechState2().then(
(value) =>
{onVoiceText2()});
},
),
],
)),
],
),
Stack(
children: [
AppTextFieldCustom(
hintText: TranslationBase.of(context)
.impressionRecommendation,
controller: recommendationController,
maxLines: 15,
minLines: 10,
hasBorder: true,
validationError: comments3Error,
),
Positioned(
top: -2,
//MediaQuery.of(context).size.height * 0,
right: projectViewModel.isArabic
? MediaQuery.of(context)
.size
.width *
0.75
: 15,
child: Column(
children: [
IconButton(
icon: Icon(
DoctorApp.speechtotext,
color: Colors.black,
size: 35),
onPressed: () {
initSpeechState3().then(
(value) =>
{onVoiceText3()});
},
),
],
)),
],
),
], ],
), ),
), ),
@ -231,32 +121,13 @@ class _AddVerifyMedicalReportState extends State<AddVerifyMedicalReport> {
// disabled: progressNoteController.text.isEmpty, // disabled: progressNoteController.text.isEmpty,
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
onPressed: () async { onPressed: () async {
setState(() {
if (historyFindingController.text == "") { String txtOfMedicalReport = await HtmlEditor.getText();
commentsError =
TranslationBase.of(context).fieldRequired; if (txtOfMedicalReport.isNotEmpty) {
} else {
commentsError = null;
}
if (laboratoryDataController.text == "") {
comments2Error =
TranslationBase.of(context).fieldRequired;
} else {
comments2Error = null;
}
if (recommendationController.text == "") {
comments3Error =
TranslationBase.of(context).fieldRequired;
} else {
comments3Error = null;
}
});
if (historyFindingController.text != "" &&
laboratoryDataController.text != "" &&
recommendationController.text != "") {
GifLoaderDialogUtils.showMyDialog(context); GifLoaderDialogUtils.showMyDialog(context);
model.insertMedicalReport(patient, model.insertMedicalReport(patient,txtOfMedicalReport
"${historyFindingController.text}\n${laboratoryDataController.text}\n${recommendationController.text}"); );
GifLoaderDialogUtils.hideDialog(context); GifLoaderDialogUtils.hideDialog(context);
if (model.state == ViewState.ErrorLocal) { if (model.state == ViewState.ErrorLocal) {
DrAppToastMsg.showErrorToast(model.error); DrAppToastMsg.showErrorToast(model.error);

2
lib/screens/patients/profile/medical_report/MedicalReportPage.dart
Unescape Escape View File

@ -36,6 +36,8 @@ class MedicalReportPage extends StatelessWidget {
builder: (_, model, w) => AppScaffold( builder: (_, model, w) => AppScaffold(
baseViewModel: model, baseViewModel: model,
isShowAppBar: true, isShowAppBar: true,
backgroundColor: Theme.of(context).scaffoldBackgroundColor,
appBar: PatientProfileHeaderNewDesignAppBar( appBar: PatientProfileHeaderNewDesignAppBar(
patient, patient,
patientType, patientType,

2
lib/widgets/shared/text_fields/html_rich_editor.dart
Unescape Escape View File

@ -82,8 +82,8 @@ class _HtmlRichEditorState extends State<HtmlRichEditor> {
// Style(), // Style(),
Font(buttons: [ Font(buttons: [
FontButtons.bold, FontButtons.bold,
FontButtons.italic,
FontButtons.underline, FontButtons.underline,
FontButtons.clear
]), ]),
// ColorBar(buttons: [ColorButtons.color]), // ColorBar(buttons: [ColorButtons.color]),
Paragraph(buttons: [ Paragraph(buttons: [

2
pubspec.yaml
Unescape Escape View File

@ -92,7 +92,7 @@ dependencies:
#Html Editor Enhanced # Html Editor Enhanced
html_editor_enhanced: ^1.3.0 html_editor_enhanced: ^1.3.0
dev_dependencies: dev_dependencies:

Write Preview
Loading…
Cancel
Save