Merge branch 'patient_app_services' into 'development'

Patient app services

See merge request Cloud_Solution/doctor_app_flutter!457
merge-requests/460/head
Mohammad Aljammal 5 years ago
commit 76b80600c6

@ -4,8 +4,8 @@ const MAX_SMALL_SCREEN = 660;
const ONLY_NUMBERS = "[0-9]"; const ONLY_NUMBERS = "[0-9]";
const ONLY_LETTERS = "[a-zA-Z &'\"]"; const ONLY_LETTERS = "[a-zA-Z &'\"]";
const ONLY_DATE = "[0-9/]"; const ONLY_DATE = "[0-9/]";
//const BASE_URL = 'https://hmgwebservices.com/'; const BASE_URL = 'https://hmgwebservices.com/';
const BASE_URL = 'https://uat.hmgwebservices.com/'; // const BASE_URL = 'https://uat.hmgwebservices.com/';
const PHARMACY_ITEMS_URL = "Services/Lists.svc/REST/GetPharmcyItems_Region_enh"; const PHARMACY_ITEMS_URL = "Services/Lists.svc/REST/GetPharmcyItems_Region_enh";
const PHARMACY_LIST_URL = "Services/Patients.svc/REST/GetPharmcyList"; const PHARMACY_LIST_URL = "Services/Patients.svc/REST/GetPharmcyList";
const PATIENT_PROGRESS_NOTE_URL = const PATIENT_PROGRESS_NOTE_URL =

@ -1020,12 +1020,12 @@ class _DashboardScreenState extends State<DashboardScreen> {
), ),
hasBorder: false, hasBorder: false,
onTap: () { onTap: () {
Navigator.push( // Navigator.push(
context, // context,
MaterialPageRoute( // MaterialPageRoute(
builder: (context) => // builder: (context) =>
SearchMedicinePatientScreen(), // SearchMedicinePatientScreen(),
)); // ));
}, },
) )
], ],

@ -160,95 +160,109 @@ class _InsuranceApprovalsDetailsState extends State<InsuranceApprovalsDetails> {
), ),
], ],
), ),
Padding( Expanded(
padding: const EdgeInsets.symmetric( child: Padding(
horizontal: 8.0), padding: const EdgeInsets.symmetric(
child: Column( horizontal: 8.0),
crossAxisAlignment: child: Column(
CrossAxisAlignment.start, crossAxisAlignment:
//mainAxisAlignment: MainAxisAlignment.center, CrossAxisAlignment.start,
children: [ //mainAxisAlignment: MainAxisAlignment.center,
SizedBox( children: [
height: 25.0, SizedBox(
), height: 25.0,
Row( ),
children: [ Row(
Texts( children: [
'Clinic: ', Texts(
color: Colors.grey[500], 'Clinic: ',
), color: Colors.grey[500],
Texts( fontSize: 14,
model ),
.insuranceApproval[ Expanded(
indexInsurance] child: Texts(
.clinicName, model
) .insuranceApproval[
], indexInsurance]
), .clinicName,
Row( fontSize: 14,
children: <Widget>[ ),
Texts( )
'Approval No: ', ],
color: Colors.grey[500], ),
), Row(
Texts( children: <Widget>[
model Texts(
'Approval No: ',
color: Colors.grey[500],
fontSize: 14,
),
Texts(
model
.insuranceApproval[
indexInsurance]
.approvalNo
.toString(),
fontSize: 14,
)
],
),
Row(
children: <Widget>[
Texts(
'Unused Count:',
color: Colors.grey[500],
fontSize: 14,
),
Texts(model
.insuranceApproval[ .insuranceApproval[
indexInsurance] indexInsurance]
.approvalNo .unUsedCount
.toString(), .toString(),
) fontSize: 14,
], )
),
Row( ],
children: <Widget>[ ),
Texts( Row(
'Unused Count:', children: <Widget>[
color: Colors.grey[500], Texts(
), 'Company Name :',
Texts(model color: Colors.grey[500],
.insuranceApproval[ ),
indexInsurance] Texts('Sample')
.unUsedCount ],
.toString()) ),
], Row(
), children: [
Row( Texts(
children: <Widget>[ 'Receipt on: ',
Texts( color: Colors.grey[500],
'Company Name :', ),
color: Colors.grey[500], Expanded(
), child: Texts(
Texts('Sample') '${DateUtils.getDayMonthYearDateFormatted(DateUtils.getDateTimeFromServerFormat(model.insuranceApproval[indexInsurance].rceiptOn), isArabic: projectViewModel.isArabic)}',
], color: Colors.black,
), fontWeight: FontWeight.w600,
Row( ),
children: [ ),
Texts( ],
'Receipt on: ', ),
color: Colors.grey[500], Row(
), children: [
Texts( Texts(
'${DateUtils.getDayMonthYearDateFormatted(DateUtils.getDateTimeFromServerFormat(model.insuranceApproval[indexInsurance].rceiptOn), isArabic: projectViewModel.isArabic)}', 'Exp on: ',
color: Colors.black, color: Colors.grey[500],
fontWeight: FontWeight.w600, ),
), Texts(
], '${DateUtils.getDayMonthYearDateFormatted(DateUtils.getDateTimeFromServerFormat(model.insuranceApproval[indexInsurance].expiryDate), isArabic: projectViewModel.isArabic)}',
), color: Colors.black,
Row( fontWeight: FontWeight.w600,
children: [ ),
Texts( ],
'Exp on: ', ),
color: Colors.grey[500], ],
), ),
Texts(
'${DateUtils.getDayMonthYearDateFormatted(DateUtils.getDateTimeFromServerFormat(model.insuranceApproval[indexInsurance].expiryDate), isArabic: projectViewModel.isArabic)}',
color: Colors.black,
fontWeight: FontWeight.w600,
),
],
),
],
), ),
), ),
], ],
@ -264,34 +278,20 @@ class _InsuranceApprovalsDetailsState extends State<InsuranceApprovalsDetails> {
padding: const EdgeInsets.symmetric( padding: const EdgeInsets.symmetric(
horizontal: 8.0), horizontal: 8.0),
child: Row( child: Row(
mainAxisAlignment:
MainAxisAlignment.spaceAround,
children: [ children: [
Container( Expanded(
width: MediaQuery.of(context)
.size
.width *
0.33,
child: Texts( child: Texts(
'Procedure', 'Procedure',
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
), ),
), ),
Container( Expanded(
width: MediaQuery.of(context)
.size
.width *
0.33,
child: Texts( child: Texts(
'Status', 'Status',
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
), ),
), ),
Container( Expanded(
width: MediaQuery.of(context)
.size
.width *
0.21,
child: Texts( child: Texts(
'Usage Status', 'Usage Status',
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
@ -316,78 +316,58 @@ class _InsuranceApprovalsDetailsState extends State<InsuranceApprovalsDetails> {
itemBuilder: (BuildContext context, itemBuilder: (BuildContext context,
int index) { int index) {
return Container( return Container(
child: Row( child: Column(
mainAxisAlignment:
MainAxisAlignment
.spaceAround,
crossAxisAlignment:
CrossAxisAlignment.start,
children: [ children: [
Container( Row(
height:
MediaQuery.of(context) children: [
.size Expanded(
.height * child: Container(
0.15, //130.0,
width: child: Texts(model
MediaQuery.of(context) .insuranceApproval[
.size indexInsurance]
.width * ?.apporvalDetails[
0.33, index]
child: Texts(model ?.procedureName ??
.insuranceApproval[ "",textAlign: TextAlign.start,),
indexInsurance] ),
?.apporvalDetails[ ),
index] Expanded(
?.procedureName ?? child: Container(
""),
), child: Texts(model
Container( .insuranceApproval[
height: indexInsurance]
MediaQuery.of(context) ?.apporvalDetails[
.size index]
.height * ?.status ??
0.15, "",textAlign: TextAlign.center,),
width: ),
MediaQuery.of(context) ),
.size Expanded(
.width * child: Container(
0.33, child: Texts(model
child: Texts(model .insuranceApproval[
.insuranceApproval[ indexInsurance]
indexInsurance] ?.apporvalDetails[
?.apporvalDetails[ index]
index] ?.isInvoicedDesc ??
?.status ?? "",textAlign: TextAlign.center,),
""), ),
),
],
), ),
Container( SizedBox(width: 5,),
height: Divider(
MediaQuery.of(context) color: Colors.black38,
.size
.height *
0.15,
width:
MediaQuery.of(context)
.size
.width *
0.21,
child: Texts(model
.insuranceApproval[
indexInsurance]
?.apporvalDetails[
index]
?.isInvoicedDesc ??
""),
), ),
], ],
), ),
); );
}), }),
), ),
Divider(
color: Colors.black45,
),
], ],
), ),
), ),

@ -35,7 +35,6 @@ class PrescriptionItemsPage extends StatelessWidget {
patient: patient, patient: patient,
patientType: patientType??"0", patientType: patientType??"0",
arrivalType: arrivalType??"0", arrivalType: arrivalType??"0",
branch: '',
clinic: prescriptions.clinicDescription, clinic: prescriptions.clinicDescription,
isPrescriptions: true, isPrescriptions: true,
appointmentDate: DateUtils.getDateTimeFromServerFormat(prescriptions.appointmentDate), appointmentDate: DateUtils.getDateTimeFromServerFormat(prescriptions.appointmentDate),

@ -61,7 +61,7 @@ class ProcedureScreen extends StatelessWidget {
], ],
), ),
), ),
if (patientType != null && patientType == '7') if (patientType != null && patientType == '7' && patient.patientStatusType == 43)
InkWell( InkWell(
onTap: () { onTap: () {
addSelectedProcedure(context, model, patient); addSelectedProcedure(context, model, patient);

@ -236,9 +236,11 @@ class SMSOTP {
Padding( Padding(
padding: EdgeInsets.only(top: 10), padding: EdgeInsets.only(top: 10),
child: Row(children: [ child: Row(children: [
AppText( Expanded(
TranslationBase.of(context).validationMessage + ' ', child: AppText(
fontWeight: FontWeight.w600, TranslationBase.of(context).validationMessage + ' ',
fontWeight: FontWeight.w600,
),
), ),
AppText( AppText(
displayTime, displayTime,

@ -407,7 +407,7 @@ class PatientProfileHeaderWhitAppointmentAppBar extends StatelessWidget with Pre
) )
], ],
), ),
if(isPrescriptions) if(isPrescriptions && branch!=null)
Row( Row(
children: [ children: [
Texts( Texts(

@ -692,17 +692,18 @@ class _AddAssessmentDetailsState extends State<AddAssessmentDetails> {
height: 16, height: 16,
), ),
Row( Row(
children: [ children: [
AppText( Expanded(
TranslationBase.of(context) child: AppText(
.addAssessmentDetails TranslationBase.of(context)
.toUpperCase(), .addAssessmentDetails
fontWeight: FontWeight.bold, .toUpperCase(),
fontSize: 13, fontWeight: FontWeight.bold,
), fontSize: 13,
SizedBox( ),
width: MediaQuery.of(context).size.width * 0.42,
), ),
InkWell( InkWell(
child: Icon( child: Icon(
Icons.close, Icons.close,

@ -1,5 +1,6 @@
import 'package:doctor_app_flutter/config/config.dart'; import 'package:doctor_app_flutter/config/config.dart';
import 'package:doctor_app_flutter/config/shared_pref_kay.dart'; import 'package:doctor_app_flutter/config/shared_pref_kay.dart';
import 'package:doctor_app_flutter/config/size_config.dart';
import 'package:doctor_app_flutter/core/enum/viewstate.dart'; import 'package:doctor_app_flutter/core/enum/viewstate.dart';
import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart';
import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart';
@ -9,15 +10,18 @@ import 'package:doctor_app_flutter/models/SOAP/post_progress_note_request_model.
import 'package:doctor_app_flutter/models/doctor/doctor_profile_model.dart'; import 'package:doctor_app_flutter/models/doctor/doctor_profile_model.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/date-utils.dart';
import 'package:doctor_app_flutter/util/helpers.dart'; import 'package:doctor_app_flutter/util/helpers.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/shared/Text.dart'; import 'package:doctor_app_flutter/widgets/shared/Text.dart';
import 'package:doctor_app_flutter/widgets/shared/TextFields.dart'; import 'package:doctor_app_flutter/widgets/shared/TextFields.dart';
import 'package:doctor_app_flutter/widgets/shared/app-textfield-custom.dart';
import 'package:doctor_app_flutter/widgets/shared/app_buttons_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_buttons_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/divider_with_spaces_around.dart'; import 'package:doctor_app_flutter/widgets/shared/divider_with_spaces_around.dart';
import 'package:doctor_app_flutter/widgets/shared/expandable-widget-header-body.dart'; import 'package:doctor_app_flutter/widgets/shared/expandable-widget-header-body.dart';
import 'package:doctor_app_flutter/widgets/shared/new_text_Field.dart';
import 'package:eva_icons_flutter/eva_icons_flutter.dart'; import 'package:eva_icons_flutter/eva_icons_flutter.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:font_awesome_flutter/font_awesome_flutter.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart';
@ -58,6 +62,7 @@ class _UpdatePlanPageState extends State<UpdatePlanPage> {
)), )),
); );
} }
TextEditingController typeController = TextEditingController();
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
@ -84,221 +89,251 @@ class _UpdatePlanPageState extends State<UpdatePlanPage> {
}, },
builder: (_, model, w) => AppScaffold( builder: (_, model, w) => AppScaffold(
// baseViewModel: model, // baseViewModel: model,
backgroundColor: Colors.grey[200],
isShowAppBar: false, isShowAppBar: false,
body: SingleChildScrollView( body: SingleChildScrollView(
physics: ScrollPhysics(), physics: ScrollPhysics(),
child: Center( child: Center(
child: FractionallySizedBox( child: FractionallySizedBox(
widthFactor: 0.9, widthFactor: 0.95,
child: Column( child: Container(
mainAxisAlignment: MainAxisAlignment.start, margin: EdgeInsets.all(8.0),
children: [ padding: EdgeInsets.all(12.0),
SizedBox( decoration: BoxDecoration(
height: 30, shape: BoxShape.rectangle,
), color: Colors.white,
HeaderBodyExpandableNotifier( borderRadius: BorderRadius.circular(12),
headerWidget: Row( border: Border.fromBorderSide(BorderSide(
mainAxisAlignment: MainAxisAlignment.spaceBetween, color: Colors.grey.shade400,
children: [ width: 0.4,
Row( )),
children: [ ),
Texts(TranslationBase child: Column(
.of(context) mainAxisAlignment: MainAxisAlignment.start,
.progressNoteSOAP, children: [
variant: isProgressNoteExpand ? "bodyText" : '', SizedBox(
bold: isProgressNoteExpand ? true : false, height: 10,
color: Colors.black),
Icon(
FontAwesomeIcons.asterisk,
color: AppGlobal.appPrimaryColor,
size: 12,
)
],
),
InkWell(
onTap: () {
setState(() {
isProgressNoteExpand = !isProgressNoteExpand;
});
},
child: Icon(isProgressNoteExpand
? EvaIcons.minus
: EvaIcons.plus))
],
), ),
bodyWidget: Column(children: [ HeaderBodyExpandableNotifier(
SizedBox( headerWidget: Row(
height: 20, mainAxisAlignment: MainAxisAlignment.spaceAround,
),
Column(
children: [ children: [
if(widget.patientProgressNote.planNote == null) Row(
Container( children: [
margin: Texts(TranslationBase
EdgeInsets.only(left: 10, right: 10, top: 15), .of(context)
child: TextFields( .progressNoteSOAP,
variant: isProgressNoteExpand ? "bodyText" : '',
bold: isProgressNoteExpand ? true : false,
color: Colors.black),
Icon(
FontAwesomeIcons.asterisk,
color: Colors.black,
size: 12,
)
],
),
InkWell(
onTap: () {
setState(() {
isProgressNoteExpand = !isProgressNoteExpand;
});
},
child: Icon(isProgressNoteExpand
? Icons.keyboard_arrow_up
: Icons.keyboard_arrow_down))
],
),
bodyWidget: Column(children: [
SizedBox(
height: 2,
),
Column(
children: [
if(widget.patientProgressNote.planNote == null)
Container(
margin:
EdgeInsets.only(left: 10, right: 10, top: 15),
hintText: TranslationBase child: AppTextFieldCustom(
.of(context) hintText: TranslationBase.of(context).progressNote,
.addProgressNote, controller: progressNoteController,
fontSize: 13.5, minLines: 2,
onTapTextFields: () { maxLines: 4,
openProgressNote(context); inputType: TextInputType.multiline,
onChanged: (value){
// examination.remark = value;
}, },
readOnly: true, ),
// hintColor: Colors.black, ),
suffixIcon: EvaIcons.plusCircleOutline, SizedBox(
suffixIconColor: AppGlobal.appPrimaryColor, height: 20,
fontWeight: FontWeight.w600, ),
// controller: messageController, if ( widget.patientProgressNote.planNote != null)
validator: (value) { Container(
if (value == null) margin:
return TranslationBase.of(context) EdgeInsets.only(left: 5, right: 5, top: 15),
.emptyMessage; child: Column(
else crossAxisAlignment:
return null; CrossAxisAlignment.start,
}), children: [
),
SizedBox(
height: 20,
),
if ( widget.patientProgressNote.planNote != null)
Container(
margin:
EdgeInsets.only(left: 5, right: 5, top: 15),
child: Row(
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Column(
mainAxisAlignment: MainAxisAlignment.start,
children: [
Column(
mainAxisAlignment:
MainAxisAlignment.start,
crossAxisAlignment:
CrossAxisAlignment.start,
children: [
AppText(
widget.patientProgressNote.createdOn !=null?DateTime.parse(widget.patientProgressNote.createdOn).day.toString():DateTime.now().day.toString(), SizedBox(
fontWeight: FontWeight height: 8,
.bold, ),
fontSize: 16, Row(
), mainAxisAlignment: MainAxisAlignment.spaceAround,
AppText( children: [
Helpers.getMonth(widget.patientProgressNote.createdOn !=null?(DateTime.parse(widget.patientProgressNote.createdOn).month):DateTime.now().month).toUpperCase(), Row(
fontSize: 10, children: [
color: Colors.grey, Texts('Appointment No: '),
), Texts(widget.patientProgressNote.appointmentNo.toString()),
],
) ],
], ),
), AppText(
Column( widget.patientProgressNote.createdOn !=null?DateUtils.getDayMonthYearDateFormatted(DateTime.parse(widget.patientProgressNote.createdOn)):DateUtils.getDayMonthYearDateFormatted(DateTime.now()),
crossAxisAlignment: fontWeight: FontWeight
CrossAxisAlignment.start, .bold,
children: [ fontSize: 16,
Row( )
mainAxisAlignment:
MainAxisAlignment.start, ],
children: [ ),
SizedBox( Row(
height: 6, children: [
), Texts('Condition: '),
Padding( Texts(widget.patientProgressNote.mName.toString()),
padding: const EdgeInsets.all(0.0),
child: Container( ],
width: MediaQuery.of(context) ),
.size if(widget.patientProgressNote.createdByName !=null)
.width * Row(
0.6, mainAxisAlignment:
child: AppText( MainAxisAlignment.start,
progressNoteController.text, children: [
fontSize: 10, AppText(
color: Colors.grey, TranslationBase.of(context).createdBy,
), fontWeight: FontWeight.bold,
fontSize: 16,
),
AppText(
widget.patientProgressNote.createdByName??"",
fontSize: 10,
color: Colors.grey,
),
],
),
if(widget.patientProgressNote.editedByName !=null)
Row(
mainAxisAlignment:
MainAxisAlignment.start,
children: [
AppText(
TranslationBase.of(context).editedBy,
fontWeight: FontWeight.bold,
fontSize: 16,
),
AppText(
widget.patientProgressNote.editedByName??"",
fontSize: 10,
color: Colors.grey,
),
],
),
Row(
mainAxisAlignment:
MainAxisAlignment.start,
children: [
SizedBox(
height: 6,
),
Padding(
padding: const EdgeInsets.all(0.0),
child: Container(
width: MediaQuery.of(context)
.size
.width *
0.6,
child: Texts(
progressNoteController.text,
fontSize: 10,
color: Colors.grey,
), ),
), ),
], ),
), ],
SizedBox( ),
height: 8, ],
), ),
if(widget.patientProgressNote.createdByName !=null) )
Row( ],
mainAxisAlignment: )
MainAxisAlignment.start, ]),
children: [ isExpand: isProgressNoteExpand,
AppText( ),
TranslationBase.of(context).createdBy,
fontWeight: FontWeight.bold, ],
fontSize: 16, ),
),
AppText(
widget.patientProgressNote.createdByName??"",
fontSize: 10,
color: Colors.grey,
),
],
),
if(widget.patientProgressNote.editedByName !=null)
Row(
mainAxisAlignment:
MainAxisAlignment.start,
children: [
AppText(
TranslationBase.of(context).editedBy,
fontWeight: FontWeight.bold,
fontSize: 16,
),
AppText(
widget.patientProgressNote.editedByName??"",
fontSize: 10,
color: Colors.grey,
),
],
),
],
),
Column(
children: [
InkWell(
onTap: () {
openProgressNote(context);
},
child: Icon(EvaIcons.edit2Outline),
)
],
),
],
),
)
],
)
]),
isExpand: isProgressNoteExpand,
),
DividerWithSpacesAround(
height: 30,
),
AppButton(
title: TranslationBase.of(context).next,
loading: model.state == ViewState.BusyLocal,
onPressed: () {
submitPlan(model);
// widget.changePageViewIndex(2);
},
),
SizedBox(
height: 30,
),
],
), ),
), ),
), ),
), ),
bottomSheet: Container(
width: double.maxFinite,
height: 70,
child: Container(
margin: EdgeInsets.all(6),
child: Column(
children: [
Row(
children: [
Expanded(
child: AppButton(
title: 'Previous',
color: Colors.white38,
fontColor: Colors.black,
fontWeight: FontWeight.w700,
loading: model.state == ViewState.BusyLocal,
onPressed: () async {
setState(() {
widget.changePageViewIndex(2);
});
},
),
),
SizedBox(width: 5,),
Expanded(
child: AppButton(
title: TranslationBase.of(context).next,
fontWeight: FontWeight.w700,
loading: model.state == ViewState.BusyLocal,
disabled: progressNoteController.text.isEmpty,
onPressed: () async {
if(widget.patientProgressNote.planNote.isEmpty) {
Map profile = await sharedPref.getObj(DOCTOR_PROFILE);
DoctorProfileModel doctorProfile = DoctorProfileModel.fromJson(profile);
setState(() {
widget.patientProgressNote.createdByName = widget.patientProgressNote.createdByName ?? doctorProfile.doctorName;
widget.patientProgressNote.editedByName = doctorProfile.doctorName;
widget.patientProgressNote.createdOn = DateTime.now().toString();
widget.patientProgressNote.planNote = progressNoteController.text;
});
} else
submitPlan(model);
},
),
),
],
),
],
),
),
),
), ),
); );
} }
@ -333,74 +368,5 @@ class _UpdatePlanPageState extends State<UpdatePlanPage> {
} }
} }
openProgressNote(BuildContext context) {
showModalBottomSheet(
backgroundColor: Colors.white,
isScrollControlled: true,
context: context,
builder: (context) {
return FractionallySizedBox(
heightFactor: 0.6,
child: Container(
child: FractionallySizedBox(
widthFactor: 0.9,
child: ListView(
// crossAxisAlignment: CrossAxisAlignment.start,
children: [
SizedBox(
height: 16,
),
AppText(
TranslationBase.of(context).addProgressNote,
fontWeight: FontWeight.bold,
fontSize: 16,
),
SizedBox(
height: 10,
),
Container(
margin: EdgeInsets.only(left: 0, right: 0, top: 15),
child: TextFields(
hasLabelText: progressNoteController.text != ''?true:false,
showLabelText: true,
hintText: TranslationBase.of(context).addProgressNote,
fontSize: 13.5,
// hintColor: Colors.black,
fontWeight: FontWeight.w600,
maxLines: 16,
minLines: 8,
controller: progressNoteController,
validator: (value) {
if (value == null)
return TranslationBase
.of(context)
.emptyMessage;
else
return null;
}),
),SizedBox(
height: 10,
),
AppButton(
title: TranslationBase.of(context).add.toUpperCase(),
onPressed: () async{
Map profile = await sharedPref.getObj(DOCTOR_PROFILE);
DoctorProfileModel doctorProfile = DoctorProfileModel.fromJson(profile);
widget.patientProgressNote.createdByName = widget.patientProgressNote.createdByName??doctorProfile.doctorName;
widget.patientProgressNote.editedByName=doctorProfile.doctorName;
widget.patientProgressNote.createdOn= DateTime.now().toString() ;
widget.patientProgressNote.planNote = progressNoteController.text;
setState(() {
print(progressNoteController.text);
});
Navigator.of(context).pop();
},
),
]),
)),
);
});
}
} }

@ -69,6 +69,7 @@ class _UpdateSoapIndexState extends State<UpdateSoapIndex>
isLoading: _isLoading, isLoading: _isLoading,
isShowAppBar: false, isShowAppBar: false,
body: SingleChildScrollView( body: SingleChildScrollView(
child: SingleChildScrollView(
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
@ -141,6 +142,6 @@ class _UpdateSoapIndexState extends State<UpdateSoapIndex>
), ),
), ),
), ),
); ));
} }
} }

@ -608,7 +608,7 @@ packages:
name: meta name: meta
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.3.0-nullsafety.4" version: "1.3.0-nullsafety.3"
mime: mime:
dependency: transitive dependency: transitive
description: description:
@ -900,7 +900,7 @@ packages:
name: stack_trace name: stack_trace
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.10.0-nullsafety.2" version: "1.10.0-nullsafety.1"
stream_channel: stream_channel:
dependency: transitive dependency: transitive
description: description:
@ -1084,5 +1084,5 @@ packages:
source: hosted source: hosted
version: "2.2.1" version: "2.2.1"
sdks: sdks:
dart: ">=2.10.0 <=2.11.0-213.1.beta" dart: ">=2.10.0 <2.11.0"
flutter: ">=1.22.0 <2.0.0" flutter: ">=1.22.0 <2.0.0"

Loading…
Cancel
Save