|
|
|
|
@ -8,6 +8,7 @@ import 'package:doctor_app_flutter/models/SOAP/master_key_model.dart';
|
|
|
|
|
import 'package:doctor_app_flutter/models/SOAP/selected_items/my_selected_assement.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/patients/profile/soap_update/shared_soap_widgets/remark_text.dart';
|
|
|
|
|
import 'package:doctor_app_flutter/screens/patients/profile/soap_update/soap_utils.dart';
|
|
|
|
|
import 'package:doctor_app_flutter/util/date-utils.dart';
|
|
|
|
|
import 'package:doctor_app_flutter/util/helpers.dart';
|
|
|
|
|
@ -152,7 +153,7 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> {
|
|
|
|
|
mySelectedAssessmentList.map((assessment) {
|
|
|
|
|
return Container(
|
|
|
|
|
margin: EdgeInsets.only(
|
|
|
|
|
left: 5, right: 5, top: 15),
|
|
|
|
|
left: 5, right: 5, top: 15, bottom: 15),
|
|
|
|
|
child: Row(
|
|
|
|
|
mainAxisAlignment:
|
|
|
|
|
MainAxisAlignment.spaceBetween,
|
|
|
|
|
@ -166,11 +167,11 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> {
|
|
|
|
|
RichText(
|
|
|
|
|
text: new TextSpan(
|
|
|
|
|
style: new TextStyle(
|
|
|
|
|
fontSize: 12,
|
|
|
|
|
fontSize: 10,
|
|
|
|
|
color: Color(0xFF2E303A),
|
|
|
|
|
fontFamily: 'Poppins',
|
|
|
|
|
fontWeight:
|
|
|
|
|
FontWeight.w600),
|
|
|
|
|
fontWeight: FontWeight.w600,
|
|
|
|
|
letterSpacing: -0.4),
|
|
|
|
|
children: <TextSpan>[
|
|
|
|
|
new TextSpan(
|
|
|
|
|
text:
|
|
|
|
|
@ -194,11 +195,12 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> {
|
|
|
|
|
child: RichText(
|
|
|
|
|
text: new TextSpan(
|
|
|
|
|
style: new TextStyle(
|
|
|
|
|
fontSize: 16,
|
|
|
|
|
color: Color(0xFF2E303A),
|
|
|
|
|
fontFamily: 'Poppins',
|
|
|
|
|
fontWeight:
|
|
|
|
|
FontWeight.w600),
|
|
|
|
|
fontSize: 16,
|
|
|
|
|
color: Color(0xFF2E303A),
|
|
|
|
|
fontFamily: 'Poppins',
|
|
|
|
|
fontWeight: FontWeight.w600,
|
|
|
|
|
letterSpacing: -0.64,
|
|
|
|
|
),
|
|
|
|
|
children: <TextSpan>[
|
|
|
|
|
new TextSpan(
|
|
|
|
|
text: assessment
|
|
|
|
|
@ -213,17 +215,19 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> {
|
|
|
|
|
RichText(
|
|
|
|
|
text: new TextSpan(
|
|
|
|
|
style: new TextStyle(
|
|
|
|
|
fontSize: 12,
|
|
|
|
|
color: Color(0xFF2E303A),
|
|
|
|
|
fontFamily: 'Poppins',
|
|
|
|
|
fontWeight:
|
|
|
|
|
FontWeight.w600),
|
|
|
|
|
fontSize: 12,
|
|
|
|
|
color: Color(0xFF2E303A),
|
|
|
|
|
fontFamily: 'Poppins',
|
|
|
|
|
fontWeight: FontWeight.w600,
|
|
|
|
|
),
|
|
|
|
|
children: <TextSpan>[
|
|
|
|
|
new TextSpan(
|
|
|
|
|
text: TranslationBase.of(
|
|
|
|
|
context)
|
|
|
|
|
.appointmentNo,
|
|
|
|
|
style: new TextStyle(
|
|
|
|
|
fontSize: 10,
|
|
|
|
|
letterSpacing: -0.4,
|
|
|
|
|
color: Color(0xFF575757),
|
|
|
|
|
),
|
|
|
|
|
),
|
|
|
|
|
@ -234,6 +238,7 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> {
|
|
|
|
|
"",
|
|
|
|
|
style: new TextStyle(
|
|
|
|
|
fontSize: 14,
|
|
|
|
|
letterSpacing: -0.48,
|
|
|
|
|
color: Color(0xFF2B353E),
|
|
|
|
|
),
|
|
|
|
|
),
|
|
|
|
|
@ -255,6 +260,7 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> {
|
|
|
|
|
.condition +
|
|
|
|
|
" : ",
|
|
|
|
|
style: new TextStyle(
|
|
|
|
|
letterSpacing: -0.4,
|
|
|
|
|
color: Color(0xFF575757),
|
|
|
|
|
),
|
|
|
|
|
),
|
|
|
|
|
@ -268,7 +274,8 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> {
|
|
|
|
|
.selectedDiagnosisCondition
|
|
|
|
|
.nameEn,
|
|
|
|
|
style: new TextStyle(
|
|
|
|
|
fontSize: 14,
|
|
|
|
|
fontSize: 12,
|
|
|
|
|
letterSpacing: -0.48,
|
|
|
|
|
color: Color(0xFF2B353E),
|
|
|
|
|
),
|
|
|
|
|
),
|
|
|
|
|
@ -278,7 +285,7 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> {
|
|
|
|
|
RichText(
|
|
|
|
|
text: new TextSpan(
|
|
|
|
|
style: new TextStyle(
|
|
|
|
|
fontSize: 12,
|
|
|
|
|
fontSize: 10,
|
|
|
|
|
color: Color(0xFF2E303A),
|
|
|
|
|
fontFamily: 'Poppins',
|
|
|
|
|
fontWeight:
|
|
|
|
|
@ -290,6 +297,7 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> {
|
|
|
|
|
.dType +
|
|
|
|
|
' : ',
|
|
|
|
|
style: new TextStyle(
|
|
|
|
|
letterSpacing: -0.4,
|
|
|
|
|
color: Color(0xFF575757),
|
|
|
|
|
),
|
|
|
|
|
),
|
|
|
|
|
@ -303,7 +311,8 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> {
|
|
|
|
|
.selectedDiagnosisType
|
|
|
|
|
.nameEn,
|
|
|
|
|
style: new TextStyle(
|
|
|
|
|
fontSize: 14,
|
|
|
|
|
fontSize: 12,
|
|
|
|
|
letterSpacing: -0.48,
|
|
|
|
|
color: Color(0xFF2B353E),
|
|
|
|
|
),
|
|
|
|
|
),
|
|
|
|
|
@ -323,9 +332,10 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> {
|
|
|
|
|
new TextSpan(
|
|
|
|
|
text: TranslationBase.of(
|
|
|
|
|
context)
|
|
|
|
|
.doc +
|
|
|
|
|
.doctor +
|
|
|
|
|
' : ',
|
|
|
|
|
style: new TextStyle(
|
|
|
|
|
fontSize: 10,letterSpacing: -0.4,
|
|
|
|
|
color:
|
|
|
|
|
Color(0xFF575757),
|
|
|
|
|
),
|
|
|
|
|
@ -335,7 +345,7 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> {
|
|
|
|
|
.doctorName ??
|
|
|
|
|
'',
|
|
|
|
|
style: new TextStyle(
|
|
|
|
|
fontSize: 14,
|
|
|
|
|
fontSize: 12,letterSpacing: -0.48,
|
|
|
|
|
color:
|
|
|
|
|
Color(0xFF2B353E),
|
|
|
|
|
),
|
|
|
|
|
@ -370,17 +380,9 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> {
|
|
|
|
|
fontFamily: 'Poppins',
|
|
|
|
|
fontWeight:
|
|
|
|
|
FontWeight.w600),
|
|
|
|
|
Container(
|
|
|
|
|
width: MediaQuery.of(context)
|
|
|
|
|
.size
|
|
|
|
|
.width *
|
|
|
|
|
0.38,
|
|
|
|
|
child: AppText(
|
|
|
|
|
assessment.remark ?? "",
|
|
|
|
|
fontSize: 11,
|
|
|
|
|
color: Color(0xFF2B353E),
|
|
|
|
|
fontWeight: FontWeight.w700,
|
|
|
|
|
),
|
|
|
|
|
RemarkText(
|
|
|
|
|
remark:
|
|
|
|
|
assessment.remark ?? "",
|
|
|
|
|
),
|
|
|
|
|
],
|
|
|
|
|
),
|
|
|
|
|
@ -393,6 +395,8 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> {
|
|
|
|
|
Row(
|
|
|
|
|
children: [
|
|
|
|
|
Column(
|
|
|
|
|
crossAxisAlignment:
|
|
|
|
|
CrossAxisAlignment.end,
|
|
|
|
|
children: [
|
|
|
|
|
AppText(
|
|
|
|
|
assessment.createdOn !=
|
|
|
|
|
@ -408,7 +412,7 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> {
|
|
|
|
|
.now()),
|
|
|
|
|
fontWeight:
|
|
|
|
|
FontWeight.w600,
|
|
|
|
|
fontSize: 14,
|
|
|
|
|
fontSize: 12,
|
|
|
|
|
),
|
|
|
|
|
AppText(
|
|
|
|
|
assessment.createdOn !=
|
|
|
|
|
@ -422,7 +426,8 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> {
|
|
|
|
|
.now()),
|
|
|
|
|
fontWeight:
|
|
|
|
|
FontWeight.w600,
|
|
|
|
|
fontSize: 14,
|
|
|
|
|
color: Color(0xFF575757),
|
|
|
|
|
fontSize: 12,
|
|
|
|
|
),
|
|
|
|
|
],
|
|
|
|
|
),
|
|
|
|
|
|