Haroon6138
/
PatientApp-KKUMC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remarks field added in medical instructions

Browse Source
Dev_3.3_InPatient_CR
haroon amjad 2 years ago
parent 7389010f91
commit 59b7220a1f
2 changed files with 71 additions and 42 deletions
Show Stats Download Patch File Download Diff File

2
lib/models/InPatientServices/get_medical_instructions_response_model.dart
Unescape Escape View File

@ -37,7 +37,7 @@ class GetMedicalInstructions {
}); });
} }
medicalInstructionsXMLField = json['medicalInstructionsXMLField']; medicalInstructionsXMLField = json['medicalInstructionsXMLField'];
medicalRemarksField = json['medicalRemarksField']; medicalRemarksField = json['medicalRemarks'];
projectIdField = json['projectIdField']; projectIdField = json['projectIdField'];
projectNameField = json['projectNameField']; projectNameField = json['projectNameField'];
setupIdField = json['setupIdField']; setupIdField = json['setupIdField'];

111
lib/pages/InPatientServices/medical_instructions.dart
Unescape Escape View File

@ -35,14 +35,16 @@ class _MedicalInstructionsPageState extends State<MedicalInstructionsPage> {
children: [ children: [
Padding( Padding(
padding: const EdgeInsets.all(21.0), padding: const EdgeInsets.all(21.0),
child: Text(TranslationBase.of(context).medicalInstructions, child: Text(
overflow: TextOverflow.clip, TranslationBase.of(context).medicalInstructions,
style: TextStyle( overflow: TextOverflow.clip,
fontSize: 21.0, style: TextStyle(
fontWeight: FontWeight.w600, fontSize: 21.0,
color: Color(0xff2B353E), fontWeight: FontWeight.w600,
letterSpacing: -0.64, color: Color(0xff2B353E),
)), letterSpacing: -0.64,
),
),
), ),
Expanded( Expanded(
child: Container( child: Container(
@ -57,39 +59,66 @@ class _MedicalInstructionsPageState extends State<MedicalInstructionsPage> {
), ),
child: Padding( child: Padding(
padding: EdgeInsets.all(16.0), padding: EdgeInsets.all(16.0),
child: Container( child: Column(
child: ListView.separated( crossAxisAlignment: CrossAxisAlignment.start,
itemCount: widget.getMedicalInstructionsList[0].medicaLInstructionsField.length, children: [
itemBuilder: (BuildContext context, int index) { ListView.separated(
return Container( shrinkWrap: true,
child: Row( itemCount: widget.getMedicalInstructionsList[0].medicaLInstructionsField.length,
crossAxisAlignment: CrossAxisAlignment.start, itemBuilder: (BuildContext context, int index) {
children: [ return Container(
Container( child: Row(
child: SvgPicture.asset("assets/images/new-design/ionic-ios-checkmark-circle.svg"), crossAxisAlignment: CrossAxisAlignment.start,
), children: [
Container( Container(
width: MediaQuery.of(context).size.width * 0.75, child: SvgPicture.asset("assets/images/new-design/ionic-ios-checkmark-circle.svg"),
margin: EdgeInsets.only(left: 5.0, right: 5.0), ),
child: Text(widget.getMedicalInstructionsList[0].medicaLInstructionsField[index].descriptionField, Container(
overflow: TextOverflow.clip, width: MediaQuery.of(context).size.width * 0.75,
style: TextStyle( margin: EdgeInsets.only(left: 5.0, right: 5.0),
fontSize: 14.0, child: Text(widget.getMedicalInstructionsList[0].medicaLInstructionsField[index].descriptionField,
fontWeight: FontWeight.w600, overflow: TextOverflow.clip,
color: Color(0xff2B353E), style: TextStyle(
letterSpacing: -0.64, fontSize: 14.0,
)), fontWeight: FontWeight.w600,
), color: Color(0xff2B353E),
], letterSpacing: -0.64,
)); )),
}, ),
separatorBuilder: (BuildContext context, int index) { ],
return Padding( ));
padding: const EdgeInsets.only(left: 14, right: 14), },
child: mHeight(16.0), separatorBuilder: (BuildContext context, int index) {
); return Padding(
}, padding: const EdgeInsets.only(left: 14, right: 14),
)), child: mHeight(16.0),
);
},
),
mHeight(21),
Text(
TranslationBase.of(context).remarks + ":",
overflow: TextOverflow.clip,
style: TextStyle(
fontSize: 21.0,
fontWeight: FontWeight.w600,
color: Color(0xff2B353E),
letterSpacing: -0.64,
),
),
mHeight(12),
Text(
widget.getMedicalInstructionsList[0].medicalRemarksField,
overflow: TextOverflow.clip,
style: TextStyle(
fontSize: 14.0,
fontWeight: FontWeight.w600,
color: Color(0xff2B353E),
letterSpacing: -0.64,
),
),
],
),
), ),
), ),
), ),

Write Preview
Loading…
Cancel
Save