Haroon6138
/
doctor_app_flutter
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan

Browse Source
merge-requests/564/head
Sultan Khan 4 years ago
parent acf74ab9fc d14659d2b7
commit 9e87c63d22
1 changed files with 31 additions and 19 deletions
Show Stats Download Patch File Download Diff File

50
lib/screens/patients/profile/note/progress_note_screen.dart
Unescape Escape View File

@ -71,7 +71,7 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
// appBarTitle: TranslationBase.of(context).progressNote,
appBar: PatientProfileHeaderNewDesignAppBar(
patient, patient.patientType.toString() ?? '0', arrivalType),
body: notesList == null || notesList.length == 0
body: model.patientProgressNoteList == null || model.patientProgressNoteList.length == 0
? DrAppEmbeddedError(
error: TranslationBase.of(context).errorNoProgressNote)
: Container(
@ -94,7 +94,7 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
child: Container(
child: ListView.builder(
itemCount: notesList.length,
itemCount: model.patientProgressNoteList.length,
itemBuilder: (BuildContext ctxt, int index) {
return Column(
children: [
@ -112,8 +112,8 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
crossAxisAlignment:
CrossAxisAlignment.start,
children: [
if (notesList[index].status != 2 &&
notesList[index].status != 4)
if (model.patientProgressNoteList[index].status != 2 &&
model.patientProgressNoteList[index].status != 4)
Row(
crossAxisAlignment:
CrossAxisAlignment.start,
@ -125,7 +125,7 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
MaterialPageRoute(
builder: (context) =>
UpdateNoteOrder(
note: notesList[
note: model.patientProgressNoteList[
index],
patientModel:
model,
@ -186,13 +186,13 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
.admissionNo),
cancelledNote: true,
lineItemNo:
notesList[index]
model.patientProgressNoteList[index]
.lineItemNo,
createdBy:
notesList[index]
model.patientProgressNoteList[index]
.createdBy,
notes:
notesList[index]
model.patientProgressNoteList[index]
.notes,
verifiedNote: false,
patientTypeID: patient
@ -251,12 +251,12 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
admissionNo: int.parse(
patient.admissionNo),
cancelledNote: false,
lineItemNo: notesList[index]
lineItemNo: model.patientProgressNoteList[index]
.lineItemNo,
createdBy: notesList[index]
createdBy: model.patientProgressNoteList[index]
.createdBy,
notes:
notesList[index].notes,
model.patientProgressNoteList[index].notes,
verifiedNote: true,
patientTypeID:
patient.patientType,
@ -334,14 +334,14 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
),
Expanded(
child: AppText(
notesList[index].doctorName??'',fontWeight: FontWeight.w600,fontSize: 12,),
model.patientProgressNoteList[index].doctorName??'',fontWeight: FontWeight.w600,fontSize: 12,),
),
],
),
if(notesList[index].status == 4)
if(model.patientProgressNoteList[index].status == 4)
AppText(
'Canceled',fontWeight: FontWeight.w600, color: Colors.red.shade700,fontSize: 12,),
if(notesList[index].status == 2)
if(model.patientProgressNoteList[index].status == 2)
AppText(
'verified',fontWeight: FontWeight.w600, color: Colors.grey.shade700,fontSize: 12,),
],
@ -350,12 +350,12 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
Column(
children: [
AppText(
notesList[index]
model.patientProgressNoteList[index]
.createdOn !=
null
? DateUtils
.getDayMonthYearDateFormatted(
DateUtils.getDateTimeFromServerFormat(notesList[index].createdOn))
DateUtils.getDateTimeFromServerFormat(model.patientProgressNoteList[index].createdOn))
: DateUtils
.getDayMonthYearDateFormatted(
DateTime.now()),
@ -363,12 +363,12 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
fontSize: 14,
),
AppText(
notesList[index]
model.patientProgressNoteList[index]
.createdOn !=
null
? DateUtils
.getHour(
DateUtils.getDateTimeFromServerFormat(notesList[index].createdOn ))
DateUtils.getDateTimeFromServerFormat(model.patientProgressNoteList[index].createdOn ))
: DateUtils
.getHour(
DateTime.now()),
@ -376,13 +376,25 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
fontSize: 14,
),
],
crossAxisAlignment: CrossAxisAlignment.end,
crossAxisAlignment:
CrossAxisAlignment.end,
)
],
),
SizedBox(
height: 8,
),
Row(
mainAxisAlignment:
MainAxisAlignment.start,
children: [
Expanded(
child: AppText(
model.patientProgressNoteList[index].notes,
fontSize: 10,
),
),
])
],
),
),

Write Preview
Loading…
Cancel
Save