|
|
|
@ -45,7 +45,8 @@ class UpdateAssessmentPage extends StatefulWidget {
|
|
|
|
_UpdateAssessmentPageState createState() => _UpdateAssessmentPageState();
|
|
|
|
_UpdateAssessmentPageState createState() => _UpdateAssessmentPageState();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> implements AssessmentCallBack{
|
|
|
|
class _UpdateAssessmentPageState extends State<UpdateAssessmentPage>
|
|
|
|
|
|
|
|
implements AssessmentCallBack {
|
|
|
|
bool isAssessmentExpand = false;
|
|
|
|
bool isAssessmentExpand = false;
|
|
|
|
List<MySelectedAssessment> mySelectedAssessmentList = List();
|
|
|
|
List<MySelectedAssessment> mySelectedAssessmentList = List();
|
|
|
|
|
|
|
|
|
|
|
|
@ -126,7 +127,9 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> implements
|
|
|
|
children: [
|
|
|
|
children: [
|
|
|
|
SOAPStepHeader(
|
|
|
|
SOAPStepHeader(
|
|
|
|
currentIndex: widget.currentIndex,
|
|
|
|
currentIndex: widget.currentIndex,
|
|
|
|
changePageViewIndex: widget.changePageViewIndex),
|
|
|
|
changePageViewIndex: widget.changePageViewIndex,
|
|
|
|
|
|
|
|
patientInfo: widget.patientInfo,
|
|
|
|
|
|
|
|
),
|
|
|
|
ExpandableSOAPWidget(
|
|
|
|
ExpandableSOAPWidget(
|
|
|
|
headerTitle: TranslationBase.of(context).assessment,
|
|
|
|
headerTitle: TranslationBase.of(context).assessment,
|
|
|
|
onTap: () {
|
|
|
|
onTap: () {
|
|
|
|
@ -170,24 +173,23 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> implements
|
|
|
|
RichText(
|
|
|
|
RichText(
|
|
|
|
text: new TextSpan(
|
|
|
|
text: new TextSpan(
|
|
|
|
style: new TextStyle(
|
|
|
|
style: new TextStyle(
|
|
|
|
fontSize: SizeConfig.getTextMultiplierBasedOnWidth() *3.6,
|
|
|
|
fontSize: SizeConfig
|
|
|
|
|
|
|
|
.getTextMultiplierBasedOnWidth() *
|
|
|
|
|
|
|
|
3.6,
|
|
|
|
color: Color(0xFF2E303A),
|
|
|
|
color: Color(0xFF2E303A),
|
|
|
|
fontFamily: 'Poppins',
|
|
|
|
fontFamily: 'Poppins',
|
|
|
|
fontWeight: FontWeight.w600,
|
|
|
|
fontWeight: FontWeight.w600,
|
|
|
|
letterSpacing: -0.4),
|
|
|
|
letterSpacing: -0.4),
|
|
|
|
children: <TextSpan>[
|
|
|
|
children: <TextSpan>[
|
|
|
|
new TextSpan(
|
|
|
|
new TextSpan(
|
|
|
|
text:
|
|
|
|
text: "ICD : ".toUpperCase(),
|
|
|
|
"ICD : ".toUpperCase(),
|
|
|
|
|
|
|
|
),
|
|
|
|
),
|
|
|
|
new TextSpan(
|
|
|
|
new TextSpan(
|
|
|
|
text: assessment
|
|
|
|
text: assessment
|
|
|
|
.selectedICD.code
|
|
|
|
.selectedICD.code
|
|
|
|
.trim()
|
|
|
|
.trim()
|
|
|
|
.toUpperCase() ??
|
|
|
|
.toUpperCase() ??
|
|
|
|
""
|
|
|
|
""),
|
|
|
|
|
|
|
|
|
|
|
|
),
|
|
|
|
|
|
|
|
],
|
|
|
|
],
|
|
|
|
),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
@ -199,7 +201,9 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> implements
|
|
|
|
child: RichText(
|
|
|
|
child: RichText(
|
|
|
|
text: new TextSpan(
|
|
|
|
text: new TextSpan(
|
|
|
|
style: new TextStyle(
|
|
|
|
style: new TextStyle(
|
|
|
|
fontSize: SizeConfig.getTextMultiplierBasedOnWidth() *5,
|
|
|
|
fontSize: SizeConfig
|
|
|
|
|
|
|
|
.getTextMultiplierBasedOnWidth() *
|
|
|
|
|
|
|
|
5,
|
|
|
|
color: Color(0xFF2E303A),
|
|
|
|
color: Color(0xFF2E303A),
|
|
|
|
fontFamily: 'Poppins',
|
|
|
|
fontFamily: 'Poppins',
|
|
|
|
fontWeight: FontWeight.w600,
|
|
|
|
fontWeight: FontWeight.w600,
|
|
|
|
@ -208,8 +212,7 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> implements
|
|
|
|
children: <TextSpan>[
|
|
|
|
children: <TextSpan>[
|
|
|
|
new TextSpan(
|
|
|
|
new TextSpan(
|
|
|
|
text: assessment
|
|
|
|
text: assessment
|
|
|
|
.selectedICD
|
|
|
|
.selectedICD.description
|
|
|
|
.description
|
|
|
|
|
|
|
|
.toString(),
|
|
|
|
.toString(),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
],
|
|
|
|
],
|
|
|
|
@ -219,7 +222,9 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> implements
|
|
|
|
RichText(
|
|
|
|
RichText(
|
|
|
|
text: new TextSpan(
|
|
|
|
text: new TextSpan(
|
|
|
|
style: new TextStyle(
|
|
|
|
style: new TextStyle(
|
|
|
|
fontSize: SizeConfig.getTextMultiplierBasedOnWidth() *3.5,
|
|
|
|
fontSize: SizeConfig
|
|
|
|
|
|
|
|
.getTextMultiplierBasedOnWidth() *
|
|
|
|
|
|
|
|
3.5,
|
|
|
|
color: Color(0xFF2E303A),
|
|
|
|
color: Color(0xFF2E303A),
|
|
|
|
fontFamily: 'Poppins',
|
|
|
|
fontFamily: 'Poppins',
|
|
|
|
fontWeight: FontWeight.w600,
|
|
|
|
fontWeight: FontWeight.w600,
|
|
|
|
@ -230,18 +235,21 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> implements
|
|
|
|
context)
|
|
|
|
context)
|
|
|
|
.appointmentNo,
|
|
|
|
.appointmentNo,
|
|
|
|
style: new TextStyle(
|
|
|
|
style: new TextStyle(
|
|
|
|
fontSize: SizeConfig.getTextMultiplierBasedOnWidth() *3,
|
|
|
|
fontSize: SizeConfig
|
|
|
|
|
|
|
|
.getTextMultiplierBasedOnWidth() *
|
|
|
|
|
|
|
|
3,
|
|
|
|
letterSpacing: -0.4,
|
|
|
|
letterSpacing: -0.4,
|
|
|
|
color: Color(0xFF575757),
|
|
|
|
color: Color(0xFF575757),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
new TextSpan(
|
|
|
|
new TextSpan(
|
|
|
|
text: assessment
|
|
|
|
text: assessment.appointmentId
|
|
|
|
.appointmentId
|
|
|
|
|
|
|
|
.toString() ??
|
|
|
|
.toString() ??
|
|
|
|
"",
|
|
|
|
"",
|
|
|
|
style: new TextStyle(
|
|
|
|
style: new TextStyle(
|
|
|
|
fontSize: SizeConfig.getTextMultiplierBasedOnWidth() *3.6,
|
|
|
|
fontSize: SizeConfig
|
|
|
|
|
|
|
|
.getTextMultiplierBasedOnWidth() *
|
|
|
|
|
|
|
|
3.6,
|
|
|
|
letterSpacing: -0.48,
|
|
|
|
letterSpacing: -0.48,
|
|
|
|
color: Color(0xFF2B353E),
|
|
|
|
color: Color(0xFF2B353E),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
@ -252,11 +260,12 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> implements
|
|
|
|
RichText(
|
|
|
|
RichText(
|
|
|
|
text: new TextSpan(
|
|
|
|
text: new TextSpan(
|
|
|
|
style: new TextStyle(
|
|
|
|
style: new TextStyle(
|
|
|
|
fontSize: SizeConfig.getTextMultiplierBasedOnWidth() *3,
|
|
|
|
fontSize: SizeConfig
|
|
|
|
|
|
|
|
.getTextMultiplierBasedOnWidth() *
|
|
|
|
|
|
|
|
3,
|
|
|
|
color: Color(0xFF2E303A),
|
|
|
|
color: Color(0xFF2E303A),
|
|
|
|
fontFamily: 'Poppins',
|
|
|
|
fontFamily: 'Poppins',
|
|
|
|
fontWeight:
|
|
|
|
fontWeight: FontWeight.w600),
|
|
|
|
FontWeight.w600),
|
|
|
|
|
|
|
|
children: <TextSpan>[
|
|
|
|
children: <TextSpan>[
|
|
|
|
new TextSpan(
|
|
|
|
new TextSpan(
|
|
|
|
text: TranslationBase.of(
|
|
|
|
text: TranslationBase.of(
|
|
|
|
@ -278,7 +287,9 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> implements
|
|
|
|
.selectedDiagnosisCondition
|
|
|
|
.selectedDiagnosisCondition
|
|
|
|
.nameEn,
|
|
|
|
.nameEn,
|
|
|
|
style: new TextStyle(
|
|
|
|
style: new TextStyle(
|
|
|
|
fontSize: SizeConfig.getTextMultiplierBasedOnWidth() *3.6,
|
|
|
|
fontSize: SizeConfig
|
|
|
|
|
|
|
|
.getTextMultiplierBasedOnWidth() *
|
|
|
|
|
|
|
|
3.6,
|
|
|
|
letterSpacing: -0.48,
|
|
|
|
letterSpacing: -0.48,
|
|
|
|
color: Color(0xFF2B353E),
|
|
|
|
color: Color(0xFF2B353E),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
@ -289,11 +300,12 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> implements
|
|
|
|
RichText(
|
|
|
|
RichText(
|
|
|
|
text: new TextSpan(
|
|
|
|
text: new TextSpan(
|
|
|
|
style: new TextStyle(
|
|
|
|
style: new TextStyle(
|
|
|
|
fontSize: SizeConfig.getTextMultiplierBasedOnWidth() *3,
|
|
|
|
fontSize: SizeConfig
|
|
|
|
|
|
|
|
.getTextMultiplierBasedOnWidth() *
|
|
|
|
|
|
|
|
3,
|
|
|
|
color: Color(0xFF2E303A),
|
|
|
|
color: Color(0xFF2E303A),
|
|
|
|
fontFamily: 'Poppins',
|
|
|
|
fontFamily: 'Poppins',
|
|
|
|
fontWeight:
|
|
|
|
fontWeight: FontWeight.w600),
|
|
|
|
FontWeight.w600),
|
|
|
|
|
|
|
|
children: <TextSpan>[
|
|
|
|
children: <TextSpan>[
|
|
|
|
new TextSpan(
|
|
|
|
new TextSpan(
|
|
|
|
text: TranslationBase.of(
|
|
|
|
text: TranslationBase.of(
|
|
|
|
@ -315,7 +327,9 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> implements
|
|
|
|
.selectedDiagnosisType
|
|
|
|
.selectedDiagnosisType
|
|
|
|
.nameEn,
|
|
|
|
.nameEn,
|
|
|
|
style: new TextStyle(
|
|
|
|
style: new TextStyle(
|
|
|
|
fontSize: SizeConfig.getTextMultiplierBasedOnWidth() *3.6,
|
|
|
|
fontSize: SizeConfig
|
|
|
|
|
|
|
|
.getTextMultiplierBasedOnWidth() *
|
|
|
|
|
|
|
|
3.6,
|
|
|
|
letterSpacing: -0.48,
|
|
|
|
letterSpacing: -0.48,
|
|
|
|
color: Color(0xFF2B353E),
|
|
|
|
color: Color(0xFF2B353E),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
@ -327,7 +341,9 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> implements
|
|
|
|
RichText(
|
|
|
|
RichText(
|
|
|
|
text: new TextSpan(
|
|
|
|
text: new TextSpan(
|
|
|
|
style: new TextStyle(
|
|
|
|
style: new TextStyle(
|
|
|
|
fontSize: SizeConfig.getTextMultiplierBasedOnWidth() *3.6,
|
|
|
|
fontSize: SizeConfig
|
|
|
|
|
|
|
|
.getTextMultiplierBasedOnWidth() *
|
|
|
|
|
|
|
|
3.6,
|
|
|
|
color: Color(0xFF2E303A),
|
|
|
|
color: Color(0xFF2E303A),
|
|
|
|
fontFamily: 'Poppins',
|
|
|
|
fontFamily: 'Poppins',
|
|
|
|
fontWeight:
|
|
|
|
fontWeight:
|
|
|
|
@ -339,19 +355,23 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> implements
|
|
|
|
.doctor +
|
|
|
|
.doctor +
|
|
|
|
' : ',
|
|
|
|
' : ',
|
|
|
|
style: new TextStyle(
|
|
|
|
style: new TextStyle(
|
|
|
|
fontSize: SizeConfig.getTextMultiplierBasedOnWidth() *3,letterSpacing: -0.4,
|
|
|
|
fontSize: SizeConfig
|
|
|
|
color:
|
|
|
|
.getTextMultiplierBasedOnWidth() *
|
|
|
|
Color(0xFF575757),
|
|
|
|
3,
|
|
|
|
|
|
|
|
letterSpacing: -0.4,
|
|
|
|
|
|
|
|
color: Color(0xFF575757),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
new TextSpan(
|
|
|
|
new TextSpan(
|
|
|
|
text: assessment
|
|
|
|
text:
|
|
|
|
.doctorName ??
|
|
|
|
assessment.doctorName ??
|
|
|
|
'',
|
|
|
|
'',
|
|
|
|
style: new TextStyle(
|
|
|
|
style: new TextStyle(
|
|
|
|
fontSize: SizeConfig.getTextMultiplierBasedOnWidth() *3.6,letterSpacing: -0.48,
|
|
|
|
fontSize: SizeConfig
|
|
|
|
color:
|
|
|
|
.getTextMultiplierBasedOnWidth() *
|
|
|
|
Color(0xFF2B353E),
|
|
|
|
3.6,
|
|
|
|
|
|
|
|
letterSpacing: -0.48,
|
|
|
|
|
|
|
|
color: Color(0xFF2B353E),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
],
|
|
|
|
],
|
|
|
|
@ -370,8 +390,7 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> implements
|
|
|
|
height: 6,
|
|
|
|
height: 6,
|
|
|
|
),
|
|
|
|
),
|
|
|
|
AppText(
|
|
|
|
AppText(
|
|
|
|
(assessment.remark !=
|
|
|
|
(assessment.remark != null &&
|
|
|
|
null &&
|
|
|
|
|
|
|
|
assessment.remark !=
|
|
|
|
assessment.remark !=
|
|
|
|
'')
|
|
|
|
'')
|
|
|
|
? TranslationBase.of(
|
|
|
|
? TranslationBase.of(
|
|
|
|
@ -379,14 +398,14 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> implements
|
|
|
|
.remarks +
|
|
|
|
.remarks +
|
|
|
|
" : "
|
|
|
|
" : "
|
|
|
|
: '',
|
|
|
|
: '',
|
|
|
|
fontSize: SizeConfig.getTextMultiplierBasedOnWidth() *3,
|
|
|
|
fontSize: SizeConfig
|
|
|
|
|
|
|
|
.getTextMultiplierBasedOnWidth() *
|
|
|
|
|
|
|
|
3,
|
|
|
|
color: Color(0xFF2E303A),
|
|
|
|
color: Color(0xFF2E303A),
|
|
|
|
fontFamily: 'Poppins',
|
|
|
|
fontFamily: 'Poppins',
|
|
|
|
fontWeight:
|
|
|
|
fontWeight: FontWeight.w600),
|
|
|
|
FontWeight.w600),
|
|
|
|
|
|
|
|
RemarkText(
|
|
|
|
RemarkText(
|
|
|
|
remark:
|
|
|
|
remark: assessment.remark ?? "",
|
|
|
|
assessment.remark ?? "",
|
|
|
|
|
|
|
|
),
|
|
|
|
),
|
|
|
|
],
|
|
|
|
],
|
|
|
|
),
|
|
|
|
),
|
|
|
|
@ -403,8 +422,7 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> implements
|
|
|
|
CrossAxisAlignment.end,
|
|
|
|
CrossAxisAlignment.end,
|
|
|
|
children: [
|
|
|
|
children: [
|
|
|
|
AppText(
|
|
|
|
AppText(
|
|
|
|
assessment.createdOn !=
|
|
|
|
assessment.createdOn != null
|
|
|
|
null
|
|
|
|
|
|
|
|
? AppDateUtils
|
|
|
|
? AppDateUtils
|
|
|
|
.getDayMonthYearDateFormatted(
|
|
|
|
.getDayMonthYearDateFormatted(
|
|
|
|
DateTime.parse(
|
|
|
|
DateTime.parse(
|
|
|
|
@ -412,26 +430,25 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> implements
|
|
|
|
.createdOn))
|
|
|
|
.createdOn))
|
|
|
|
: AppDateUtils
|
|
|
|
: AppDateUtils
|
|
|
|
.getDayMonthYearDateFormatted(
|
|
|
|
.getDayMonthYearDateFormatted(
|
|
|
|
DateTime
|
|
|
|
DateTime.now()),
|
|
|
|
.now()),
|
|
|
|
fontWeight: FontWeight.w600,
|
|
|
|
fontWeight:
|
|
|
|
fontSize: SizeConfig
|
|
|
|
FontWeight.w600,
|
|
|
|
.getTextMultiplierBasedOnWidth() *
|
|
|
|
fontSize: SizeConfig.getTextMultiplierBasedOnWidth() *3.6,
|
|
|
|
3.6,
|
|
|
|
),
|
|
|
|
),
|
|
|
|
AppText(
|
|
|
|
AppText(
|
|
|
|
assessment.createdOn !=
|
|
|
|
assessment.createdOn != null
|
|
|
|
null
|
|
|
|
|
|
|
|
? AppDateUtils.getHour(
|
|
|
|
? AppDateUtils.getHour(
|
|
|
|
DateTime.parse(
|
|
|
|
DateTime.parse(
|
|
|
|
assessment
|
|
|
|
assessment
|
|
|
|
.createdOn))
|
|
|
|
.createdOn))
|
|
|
|
: AppDateUtils
|
|
|
|
: AppDateUtils.getHour(
|
|
|
|
.getHour(DateTime
|
|
|
|
DateTime.now()),
|
|
|
|
.now()),
|
|
|
|
fontWeight: FontWeight.w600,
|
|
|
|
fontWeight:
|
|
|
|
|
|
|
|
FontWeight.w600,
|
|
|
|
|
|
|
|
color: Color(0xFF575757),
|
|
|
|
color: Color(0xFF575757),
|
|
|
|
fontSize: SizeConfig.getTextMultiplierBasedOnWidth() *3.6,
|
|
|
|
fontSize: SizeConfig
|
|
|
|
|
|
|
|
.getTextMultiplierBasedOnWidth() *
|
|
|
|
|
|
|
|
3.6,
|
|
|
|
),
|
|
|
|
),
|
|
|
|
],
|
|
|
|
],
|
|
|
|
),
|
|
|
|
),
|
|
|
|
@ -475,7 +492,8 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> implements
|
|
|
|
),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
),),
|
|
|
|
),
|
|
|
|
|
|
|
|
),
|
|
|
|
);
|
|
|
|
);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@ -508,9 +526,7 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> implements
|
|
|
|
@override
|
|
|
|
@override
|
|
|
|
nextFunction(model) {
|
|
|
|
nextFunction(model) {
|
|
|
|
if (mySelectedAssessmentList.isEmpty) {
|
|
|
|
if (mySelectedAssessmentList.isEmpty) {
|
|
|
|
Helpers.showErrorToast(
|
|
|
|
Helpers.showErrorToast(TranslationBase.of(context).assessmentErrorMsg);
|
|
|
|
TranslationBase.of(context)
|
|
|
|
|
|
|
|
.assessmentErrorMsg);
|
|
|
|
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
widget.changeLoadingState(true);
|
|
|
|
widget.changeLoadingState(true);
|
|
|
|
widget.changePageViewIndex(3);
|
|
|
|
widget.changePageViewIndex(3);
|
|
|
|
|