|
|
@ -134,8 +134,7 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> {
|
|
|
|
borderRadius: BorderRadius.all(
|
|
|
|
borderRadius: BorderRadius.all(
|
|
|
|
Radius.circular(10.0),
|
|
|
|
Radius.circular(10.0),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
border:
|
|
|
|
border: Border.all(color: Colors.grey[200], width: 0.5),
|
|
|
|
Border.all(color: Colors.grey[200], width: 0.5),
|
|
|
|
|
|
|
|
),
|
|
|
|
),
|
|
|
|
child: HeaderBodyExpandableNotifier(
|
|
|
|
child: HeaderBodyExpandableNotifier(
|
|
|
|
headerWidget: Row(
|
|
|
|
headerWidget: Row(
|
|
|
@ -145,14 +144,10 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> {
|
|
|
|
padding: EdgeInsets.all(12.0),
|
|
|
|
padding: EdgeInsets.all(12.0),
|
|
|
|
child: Row(
|
|
|
|
child: Row(
|
|
|
|
children: [
|
|
|
|
children: [
|
|
|
|
Texts(
|
|
|
|
Texts(TranslationBase.of(context).assessment,
|
|
|
|
TranslationBase.of(context)
|
|
|
|
variant:
|
|
|
|
.assessment,
|
|
|
|
isAssessmentExpand ? "bodyText" : '',
|
|
|
|
variant: isAssessmentExpand
|
|
|
|
bold: isAssessmentExpand ? true : false,
|
|
|
|
? "bodyText"
|
|
|
|
|
|
|
|
: '',
|
|
|
|
|
|
|
|
bold:
|
|
|
|
|
|
|
|
isAssessmentExpand ? true : false,
|
|
|
|
|
|
|
|
color: Colors.black),
|
|
|
|
color: Colors.black),
|
|
|
|
Icon(
|
|
|
|
Icon(
|
|
|
|
FontAwesomeIcons.asterisk,
|
|
|
|
FontAwesomeIcons.asterisk,
|
|
|
@ -165,8 +160,7 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> {
|
|
|
|
InkWell(
|
|
|
|
InkWell(
|
|
|
|
onTap: () {
|
|
|
|
onTap: () {
|
|
|
|
setState(() {
|
|
|
|
setState(() {
|
|
|
|
isAssessmentExpand =
|
|
|
|
isAssessmentExpand = !isAssessmentExpand;
|
|
|
|
!isAssessmentExpand;
|
|
|
|
|
|
|
|
});
|
|
|
|
});
|
|
|
|
},
|
|
|
|
},
|
|
|
|
child: Icon(isAssessmentExpand
|
|
|
|
child: Icon(isAssessmentExpand
|
|
|
@ -181,8 +175,8 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> {
|
|
|
|
Column(
|
|
|
|
Column(
|
|
|
|
children: [
|
|
|
|
children: [
|
|
|
|
Container(
|
|
|
|
Container(
|
|
|
|
margin: EdgeInsets.only(
|
|
|
|
margin:
|
|
|
|
left: 5, right: 5, top: 15),
|
|
|
|
EdgeInsets.only(left: 5, right: 5, top: 15),
|
|
|
|
child: TextFields(
|
|
|
|
child: TextFields(
|
|
|
|
hintText: TranslationBase.of(context)
|
|
|
|
hintText: TranslationBase.of(context)
|
|
|
|
.addAssessment,
|
|
|
|
.addAssessment,
|
|
|
@ -231,13 +225,11 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> {
|
|
|
|
),
|
|
|
|
),
|
|
|
|
Container(
|
|
|
|
Container(
|
|
|
|
child: AppText(
|
|
|
|
child: AppText(
|
|
|
|
assessment.selectedICD
|
|
|
|
assessment.selectedICD.code
|
|
|
|
.code
|
|
|
|
|
|
|
|
.trim()
|
|
|
|
.trim()
|
|
|
|
.toUpperCase() ??
|
|
|
|
.toUpperCase() ??
|
|
|
|
"",
|
|
|
|
"",
|
|
|
|
fontWeight:
|
|
|
|
fontWeight: FontWeight.w700,
|
|
|
|
FontWeight.w700,
|
|
|
|
|
|
|
|
fontSize: 11,
|
|
|
|
fontSize: 11,
|
|
|
|
),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
),
|
|
|
@ -250,25 +242,22 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> {
|
|
|
|
CrossAxisAlignment.start,
|
|
|
|
CrossAxisAlignment.start,
|
|
|
|
children: [
|
|
|
|
children: [
|
|
|
|
AppText(
|
|
|
|
AppText(
|
|
|
|
TranslationBase.of(
|
|
|
|
TranslationBase.of(context)
|
|
|
|
context)
|
|
|
|
|
|
|
|
.ICDName +
|
|
|
|
.ICDName +
|
|
|
|
" : ",
|
|
|
|
" : ",
|
|
|
|
fontSize: 13,
|
|
|
|
fontSize: 13,
|
|
|
|
color: Colors.grey,
|
|
|
|
color: Colors.grey,
|
|
|
|
),
|
|
|
|
),
|
|
|
|
Container(
|
|
|
|
Container(
|
|
|
|
width:
|
|
|
|
width: MediaQuery.of(context)
|
|
|
|
MediaQuery.of(context)
|
|
|
|
|
|
|
|
.size
|
|
|
|
.size
|
|
|
|
.width *
|
|
|
|
.width *
|
|
|
|
0.29,
|
|
|
|
0.29,
|
|
|
|
child: AppText(
|
|
|
|
child: AppText(
|
|
|
|
assessment.selectedICD
|
|
|
|
assessment
|
|
|
|
.description
|
|
|
|
.selectedICD.description
|
|
|
|
.toString(),
|
|
|
|
.toString(),
|
|
|
|
fontWeight:
|
|
|
|
fontWeight: FontWeight.w700,
|
|
|
|
FontWeight.w700,
|
|
|
|
|
|
|
|
fontSize: 10,
|
|
|
|
fontSize: 10,
|
|
|
|
),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
),
|
|
|
@ -279,8 +268,7 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> {
|
|
|
|
MainAxisAlignment.start,
|
|
|
|
MainAxisAlignment.start,
|
|
|
|
children: [
|
|
|
|
children: [
|
|
|
|
AppText(
|
|
|
|
AppText(
|
|
|
|
TranslationBase.of(
|
|
|
|
TranslationBase.of(context)
|
|
|
|
context)
|
|
|
|
|
|
|
|
.appointmentNo,
|
|
|
|
.appointmentNo,
|
|
|
|
fontSize: 10,
|
|
|
|
fontSize: 10,
|
|
|
|
color: Colors.grey,
|
|
|
|
color: Colors.grey,
|
|
|
@ -289,8 +277,7 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> {
|
|
|
|
assessment.appointmentId
|
|
|
|
assessment.appointmentId
|
|
|
|
.toString(),
|
|
|
|
.toString(),
|
|
|
|
fontSize: 11,
|
|
|
|
fontSize: 11,
|
|
|
|
fontWeight:
|
|
|
|
fontWeight: FontWeight.w700,
|
|
|
|
FontWeight.w700,
|
|
|
|
|
|
|
|
),
|
|
|
|
),
|
|
|
|
],
|
|
|
|
],
|
|
|
|
),
|
|
|
|
),
|
|
|
@ -299,8 +286,7 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> {
|
|
|
|
MainAxisAlignment.start,
|
|
|
|
MainAxisAlignment.start,
|
|
|
|
children: [
|
|
|
|
children: [
|
|
|
|
AppText(
|
|
|
|
AppText(
|
|
|
|
TranslationBase.of(
|
|
|
|
TranslationBase.of(context)
|
|
|
|
context)
|
|
|
|
|
|
|
|
.condition +
|
|
|
|
.condition +
|
|
|
|
" : ",
|
|
|
|
" : ",
|
|
|
|
fontSize: 10,
|
|
|
|
fontSize: 10,
|
|
|
@ -315,8 +301,7 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> {
|
|
|
|
.selectedDiagnosisCondition
|
|
|
|
.selectedDiagnosisCondition
|
|
|
|
.nameEn,
|
|
|
|
.nameEn,
|
|
|
|
fontSize: 11,
|
|
|
|
fontSize: 11,
|
|
|
|
fontWeight:
|
|
|
|
fontWeight: FontWeight.w700,
|
|
|
|
FontWeight.w700,
|
|
|
|
|
|
|
|
),
|
|
|
|
),
|
|
|
|
],
|
|
|
|
],
|
|
|
|
),
|
|
|
|
),
|
|
|
@ -325,8 +310,7 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> {
|
|
|
|
MainAxisAlignment.start,
|
|
|
|
MainAxisAlignment.start,
|
|
|
|
children: [
|
|
|
|
children: [
|
|
|
|
AppText(
|
|
|
|
AppText(
|
|
|
|
TranslationBase.of(
|
|
|
|
TranslationBase.of(context)
|
|
|
|
context)
|
|
|
|
|
|
|
|
.dType +
|
|
|
|
.dType +
|
|
|
|
' : ',
|
|
|
|
' : ',
|
|
|
|
fontSize: 10,
|
|
|
|
fontSize: 10,
|
|
|
@ -341,30 +325,25 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> {
|
|
|
|
.selectedDiagnosisType
|
|
|
|
.selectedDiagnosisType
|
|
|
|
.nameEn,
|
|
|
|
.nameEn,
|
|
|
|
fontSize: 11,
|
|
|
|
fontSize: 11,
|
|
|
|
fontWeight:
|
|
|
|
fontWeight: FontWeight.w700,
|
|
|
|
FontWeight.w700,
|
|
|
|
|
|
|
|
),
|
|
|
|
),
|
|
|
|
],
|
|
|
|
],
|
|
|
|
),
|
|
|
|
),
|
|
|
|
if (assessment.doctorName !=
|
|
|
|
if (assessment.doctorName != null)
|
|
|
|
null)
|
|
|
|
|
|
|
|
Row(
|
|
|
|
Row(
|
|
|
|
mainAxisAlignment:
|
|
|
|
mainAxisAlignment:
|
|
|
|
MainAxisAlignment.start,
|
|
|
|
MainAxisAlignment.start,
|
|
|
|
children: [
|
|
|
|
children: [
|
|
|
|
AppText(
|
|
|
|
AppText(
|
|
|
|
TranslationBase.of(
|
|
|
|
TranslationBase.of(context)
|
|
|
|
context)
|
|
|
|
|
|
|
|
.doc,
|
|
|
|
.doc,
|
|
|
|
fontSize: 10,
|
|
|
|
fontSize: 10,
|
|
|
|
color: Colors.grey,
|
|
|
|
color: Colors.grey,
|
|
|
|
),
|
|
|
|
),
|
|
|
|
AppText(
|
|
|
|
AppText(
|
|
|
|
assessment.doctorName ??
|
|
|
|
assessment.doctorName ?? '',
|
|
|
|
'',
|
|
|
|
|
|
|
|
fontSize: 11,
|
|
|
|
fontSize: 11,
|
|
|
|
fontWeight:
|
|
|
|
fontWeight: FontWeight.w700,
|
|
|
|
FontWeight.w700,
|
|
|
|
|
|
|
|
),
|
|
|
|
),
|
|
|
|
],
|
|
|
|
],
|
|
|
|
),
|
|
|
|
),
|
|
|
@ -379,10 +358,8 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> {
|
|
|
|
height: 6,
|
|
|
|
height: 6,
|
|
|
|
),
|
|
|
|
),
|
|
|
|
AppText(
|
|
|
|
AppText(
|
|
|
|
assessment.remark !=
|
|
|
|
assessment.remark != null ||
|
|
|
|
null ||
|
|
|
|
assessment.remark ==
|
|
|
|
assessment
|
|
|
|
|
|
|
|
.remark ==
|
|
|
|
|
|
|
|
''
|
|
|
|
''
|
|
|
|
? TranslationBase.of(
|
|
|
|
? TranslationBase.of(
|
|
|
|
context)
|
|
|
|
context)
|
|
|
@ -393,16 +370,14 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> {
|
|
|
|
color: Colors.grey,
|
|
|
|
color: Colors.grey,
|
|
|
|
),
|
|
|
|
),
|
|
|
|
Container(
|
|
|
|
Container(
|
|
|
|
width:
|
|
|
|
width: MediaQuery.of(context)
|
|
|
|
MediaQuery.of(context)
|
|
|
|
|
|
|
|
.size
|
|
|
|
.size
|
|
|
|
.width *
|
|
|
|
.width *
|
|
|
|
0.38,
|
|
|
|
0.38,
|
|
|
|
child: AppText(
|
|
|
|
child: AppText(
|
|
|
|
assessment.remark ?? "",
|
|
|
|
assessment.remark ?? "",
|
|
|
|
fontSize: 11,
|
|
|
|
fontSize: 11,
|
|
|
|
fontWeight:
|
|
|
|
fontWeight: FontWeight.w700,
|
|
|
|
FontWeight.w700,
|
|
|
|
|
|
|
|
),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
],
|
|
|
|
],
|
|
|
@ -416,8 +391,7 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> {
|
|
|
|
Row(
|
|
|
|
Row(
|
|
|
|
children: [
|
|
|
|
children: [
|
|
|
|
AppText(
|
|
|
|
AppText(
|
|
|
|
assessment.createdOn !=
|
|
|
|
assessment.createdOn != null
|
|
|
|
null
|
|
|
|
|
|
|
|
? DateTime.parse(
|
|
|
|
? DateTime.parse(
|
|
|
|
assessment
|
|
|
|
assessment
|
|
|
|
.createdOn)
|
|
|
|
.createdOn)
|
|
|
@ -426,8 +400,7 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> {
|
|
|
|
: DateTime.now()
|
|
|
|
: DateTime.now()
|
|
|
|
.day
|
|
|
|
.day
|
|
|
|
.toString(),
|
|
|
|
.toString(),
|
|
|
|
fontWeight:
|
|
|
|
fontWeight: FontWeight.bold,
|
|
|
|
FontWeight.bold,
|
|
|
|
|
|
|
|
fontSize: 15,
|
|
|
|
fontSize: 15,
|
|
|
|
),
|
|
|
|
),
|
|
|
|
AppText(" "),
|
|
|
|
AppText(" "),
|
|
|
@ -455,8 +428,7 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> {
|
|
|
|
),
|
|
|
|
),
|
|
|
|
InkWell(
|
|
|
|
InkWell(
|
|
|
|
onTap: () {
|
|
|
|
onTap: () {
|
|
|
|
openAssessmentDialog(
|
|
|
|
openAssessmentDialog(context,
|
|
|
|
context,
|
|
|
|
|
|
|
|
isUpdate: true,
|
|
|
|
isUpdate: true,
|
|
|
|
assessment: assessment,
|
|
|
|
assessment: assessment,
|
|
|
|
model: model);
|
|
|
|
model: model);
|
|
|
@ -496,7 +468,57 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> {
|
|
|
|
DividerWithSpacesAround(
|
|
|
|
DividerWithSpacesAround(
|
|
|
|
height: 30,
|
|
|
|
height: 30,
|
|
|
|
),
|
|
|
|
),
|
|
|
|
Row(
|
|
|
|
// Row(
|
|
|
|
|
|
|
|
// children: [
|
|
|
|
|
|
|
|
// Container(
|
|
|
|
|
|
|
|
// width: MediaQuery.of(context).size.width * 0.4,
|
|
|
|
|
|
|
|
// child: AppButton(
|
|
|
|
|
|
|
|
// title: 'Previous',
|
|
|
|
|
|
|
|
// color: Colors.white38,
|
|
|
|
|
|
|
|
// fontColor: Colors.black,
|
|
|
|
|
|
|
|
// fontWeight: FontWeight.w700,
|
|
|
|
|
|
|
|
// loading: model.state == ViewState.BusyLocal,
|
|
|
|
|
|
|
|
// onPressed: () async {
|
|
|
|
|
|
|
|
// Navigator.pop(context);
|
|
|
|
|
|
|
|
// },
|
|
|
|
|
|
|
|
// ),
|
|
|
|
|
|
|
|
// ),
|
|
|
|
|
|
|
|
// SizedBox(
|
|
|
|
|
|
|
|
// width: MediaQuery.of(context).size.width * 0.05,
|
|
|
|
|
|
|
|
// ),
|
|
|
|
|
|
|
|
// Container(
|
|
|
|
|
|
|
|
// width: MediaQuery.of(context).size.width * 0.4,
|
|
|
|
|
|
|
|
// child: AppButton(
|
|
|
|
|
|
|
|
// title: TranslationBase.of(context).next,
|
|
|
|
|
|
|
|
// fontWeight: FontWeight.w700,
|
|
|
|
|
|
|
|
// loading: model.state == ViewState.BusyLocal,
|
|
|
|
|
|
|
|
// onPressed: () async {
|
|
|
|
|
|
|
|
// if (widget.mySelectedAssessmentList.isEmpty) {
|
|
|
|
|
|
|
|
// helpers.showErrorToast(
|
|
|
|
|
|
|
|
// TranslationBase.of(context)
|
|
|
|
|
|
|
|
// .assessmentErrorMsg);
|
|
|
|
|
|
|
|
// } else {
|
|
|
|
|
|
|
|
// widget.changePageViewIndex(3);
|
|
|
|
|
|
|
|
// widget.changeLoadingState(true);
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
// },
|
|
|
|
|
|
|
|
// ),
|
|
|
|
|
|
|
|
// ),
|
|
|
|
|
|
|
|
// ],
|
|
|
|
|
|
|
|
// ),
|
|
|
|
|
|
|
|
SizedBox(
|
|
|
|
|
|
|
|
height: 130,
|
|
|
|
|
|
|
|
),
|
|
|
|
|
|
|
|
],
|
|
|
|
|
|
|
|
),
|
|
|
|
|
|
|
|
),
|
|
|
|
|
|
|
|
),
|
|
|
|
|
|
|
|
),
|
|
|
|
|
|
|
|
),
|
|
|
|
|
|
|
|
bottomSheet: Padding(
|
|
|
|
|
|
|
|
padding: const EdgeInsets.all(12.0),
|
|
|
|
|
|
|
|
child: Row(
|
|
|
|
|
|
|
|
mainAxisAlignment: MainAxisAlignment.center,
|
|
|
|
children: [
|
|
|
|
children: [
|
|
|
|
Container(
|
|
|
|
Container(
|
|
|
|
width: MediaQuery.of(context).size.width * 0.4,
|
|
|
|
width: MediaQuery.of(context).size.width * 0.4,
|
|
|
@ -507,7 +529,7 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> {
|
|
|
|
fontWeight: FontWeight.w700,
|
|
|
|
fontWeight: FontWeight.w700,
|
|
|
|
loading: model.state == ViewState.BusyLocal,
|
|
|
|
loading: model.state == ViewState.BusyLocal,
|
|
|
|
onPressed: () async {
|
|
|
|
onPressed: () async {
|
|
|
|
Navigator.pop(context);
|
|
|
|
widget.changePageViewIndex(1);
|
|
|
|
},
|
|
|
|
},
|
|
|
|
),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
),
|
|
|
@ -523,8 +545,7 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> {
|
|
|
|
onPressed: () async {
|
|
|
|
onPressed: () async {
|
|
|
|
if (widget.mySelectedAssessmentList.isEmpty) {
|
|
|
|
if (widget.mySelectedAssessmentList.isEmpty) {
|
|
|
|
helpers.showErrorToast(
|
|
|
|
helpers.showErrorToast(
|
|
|
|
TranslationBase.of(context)
|
|
|
|
TranslationBase.of(context).assessmentErrorMsg);
|
|
|
|
.assessmentErrorMsg);
|
|
|
|
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
widget.changePageViewIndex(3);
|
|
|
|
widget.changePageViewIndex(3);
|
|
|
|
widget.changeLoadingState(true);
|
|
|
|
widget.changeLoadingState(true);
|
|
|
@ -534,15 +555,9 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> {
|
|
|
|
),
|
|
|
|
),
|
|
|
|
],
|
|
|
|
],
|
|
|
|
),
|
|
|
|
),
|
|
|
|
SizedBox(
|
|
|
|
|
|
|
|
height: 30,
|
|
|
|
|
|
|
|
),
|
|
|
|
|
|
|
|
],
|
|
|
|
|
|
|
|
),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
);
|
|
|
|
),
|
|
|
|
|
|
|
|
)));
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
openAssessmentDialog(BuildContext context,
|
|
|
|
openAssessmentDialog(BuildContext context,
|
|
|
|