|
|
|
|
@ -40,8 +40,8 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
|
|
|
|
|
late List<NoteModel> notesList;
|
|
|
|
|
var filteredNotesList;
|
|
|
|
|
bool isDischargedPatient = false;
|
|
|
|
|
AuthenticationViewModel? authenticationViewModel;
|
|
|
|
|
ProjectViewModel? projectViewModel;
|
|
|
|
|
late AuthenticationViewModel authenticationViewModel;
|
|
|
|
|
late ProjectViewModel projectViewModel;
|
|
|
|
|
|
|
|
|
|
getProgressNoteList(BuildContext context, PatientViewModel model, {bool isLocalBusy = false}) async {
|
|
|
|
|
final routeArgs = ModalRoute.of(context)!.settings.arguments as Map;
|
|
|
|
|
@ -65,8 +65,8 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
|
|
|
|
|
|
|
|
|
|
@override
|
|
|
|
|
Widget build(BuildContext context) {
|
|
|
|
|
// authenticationViewModel = Provider.of(context);
|
|
|
|
|
// projectViewModel = Provider.of(context);
|
|
|
|
|
authenticationViewModel = Provider.of(context);
|
|
|
|
|
projectViewModel = Provider.of(context);
|
|
|
|
|
final routeArgs = ModalRoute.of(context)!.settings.arguments as Map;
|
|
|
|
|
PatiantInformtion patient = routeArgs['patient'];
|
|
|
|
|
String arrivalType = routeArgs['arrivalType'];
|
|
|
|
|
@ -90,308 +90,313 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
|
|
|
|
|
child: Column(
|
|
|
|
|
children: <Widget>[
|
|
|
|
|
if (!isDischargedPatient)
|
|
|
|
|
AddNewOrder(
|
|
|
|
|
onTap: () {
|
|
|
|
|
Navigator.push(
|
|
|
|
|
context,
|
|
|
|
|
MaterialPageRoute(
|
|
|
|
|
builder: (context) => UpdateNoteOrder(
|
|
|
|
|
patientModel: model,
|
|
|
|
|
patient: patient,
|
|
|
|
|
visitType: widget.visitType,
|
|
|
|
|
isUpdate: false,
|
|
|
|
|
)),
|
|
|
|
|
);
|
|
|
|
|
},
|
|
|
|
|
label: widget.visitType == 3
|
|
|
|
|
? TranslationBase.of(context).addNewOrderSheet!
|
|
|
|
|
: TranslationBase.of(context).addProgressNote!,
|
|
|
|
|
),
|
|
|
|
|
Expanded(
|
|
|
|
|
child: Container(
|
|
|
|
|
child: ListView.builder(
|
|
|
|
|
itemCount: model.patientProgressNoteList.length,
|
|
|
|
|
itemBuilder: (BuildContext ctxt, int index) {
|
|
|
|
|
return FractionallySizedBox(
|
|
|
|
|
widthFactor: 0.95,
|
|
|
|
|
child: CardWithBgWidget(
|
|
|
|
|
hasBorder: false,
|
|
|
|
|
bgColor: model.patientProgressNoteList[index].status == 1 &&
|
|
|
|
|
authenticationViewModel!.doctorProfile!.doctorID !=
|
|
|
|
|
model.patientProgressNoteList[index].createdBy
|
|
|
|
|
? Color(0xFFCC9B14)
|
|
|
|
|
: model.patientProgressNoteList[index].status == 4
|
|
|
|
|
? Colors.red.shade700
|
|
|
|
|
: model.patientProgressNoteList[index].status == 2
|
|
|
|
|
? Colors.green[600]!
|
|
|
|
|
: Color(0xFFCC9B14)!,
|
|
|
|
|
widget: Column(
|
|
|
|
|
children: [
|
|
|
|
|
Column(
|
|
|
|
|
crossAxisAlignment: CrossAxisAlignment.start,
|
|
|
|
|
children: [
|
|
|
|
|
if (model.patientProgressNoteList[index].status == 1 &&
|
|
|
|
|
authenticationViewModel!.doctorProfile!.doctorID !=
|
|
|
|
|
model.patientProgressNoteList[index].createdBy)
|
|
|
|
|
AppText(
|
|
|
|
|
TranslationBase.of(context).notePending,
|
|
|
|
|
fontWeight: FontWeight.bold,
|
|
|
|
|
color: Color(0xFFCC9B14),
|
|
|
|
|
fontSize: 12,
|
|
|
|
|
),
|
|
|
|
|
if (model.patientProgressNoteList[index].status == 4)
|
|
|
|
|
AppText(
|
|
|
|
|
TranslationBase.of(context).noteCanceled,
|
|
|
|
|
fontWeight: FontWeight.bold,
|
|
|
|
|
color: Colors.red.shade700,
|
|
|
|
|
fontSize: 12,
|
|
|
|
|
),
|
|
|
|
|
if (model.patientProgressNoteList[index].status == 2)
|
|
|
|
|
AppText(
|
|
|
|
|
TranslationBase.of(context).noteVerified,
|
|
|
|
|
fontWeight: FontWeight.bold,
|
|
|
|
|
color: Colors.green[600],
|
|
|
|
|
fontSize: 12,
|
|
|
|
|
),
|
|
|
|
|
if (model.patientProgressNoteList[index].status != 2 &&
|
|
|
|
|
model.patientProgressNoteList[index].status != 4 &&
|
|
|
|
|
authenticationViewModel!.doctorProfile!.doctorID ==
|
|
|
|
|
model.patientProgressNoteList[index].createdBy)
|
|
|
|
|
Row(
|
|
|
|
|
crossAxisAlignment: CrossAxisAlignment.start,
|
|
|
|
|
children: [
|
|
|
|
|
InkWell(
|
|
|
|
|
onTap: () {
|
|
|
|
|
Navigator.push(
|
|
|
|
|
context,
|
|
|
|
|
MaterialPageRoute(
|
|
|
|
|
builder: (context) => UpdateNoteOrder(
|
|
|
|
|
note: model.patientProgressNoteList[index],
|
|
|
|
|
patientModel: model,
|
|
|
|
|
patient: patient,
|
|
|
|
|
visitType: widget.visitType,
|
|
|
|
|
isUpdate: true,
|
|
|
|
|
)),
|
|
|
|
|
);
|
|
|
|
|
},
|
|
|
|
|
child: Container(
|
|
|
|
|
decoration: BoxDecoration(
|
|
|
|
|
color: Colors.grey[600],
|
|
|
|
|
borderRadius: BorderRadius.circular(10),
|
|
|
|
|
),
|
|
|
|
|
// color:Colors.red[600],
|
|
|
|
|
// AddNewOrder(
|
|
|
|
|
// onTap: () {
|
|
|
|
|
// Navigator.push(
|
|
|
|
|
// context,
|
|
|
|
|
// MaterialPageRoute(
|
|
|
|
|
// builder: (context) => UpdateNoteOrder(
|
|
|
|
|
// patientModel: model,
|
|
|
|
|
// patient: patient,
|
|
|
|
|
// visitType: widget.visitType,
|
|
|
|
|
// isUpdate: false,
|
|
|
|
|
// )),
|
|
|
|
|
// );
|
|
|
|
|
// },
|
|
|
|
|
// label: widget.visitType == 3
|
|
|
|
|
// ? TranslationBase.of(context).addNewOrderSheet!
|
|
|
|
|
// : TranslationBase.of(context).addProgressNote!,
|
|
|
|
|
// ),
|
|
|
|
|
Expanded(
|
|
|
|
|
child: Container(
|
|
|
|
|
child: ListView.builder(
|
|
|
|
|
itemCount: model.patientProgressNoteList.length,
|
|
|
|
|
itemBuilder: (BuildContext ctxt, int index) {
|
|
|
|
|
return FractionallySizedBox(
|
|
|
|
|
widthFactor: 0.95,
|
|
|
|
|
child: CardWithBgWidget(
|
|
|
|
|
hasBorder: false,
|
|
|
|
|
bgColor: model.patientProgressNoteList[index].status == 1 &&
|
|
|
|
|
authenticationViewModel!.doctorProfile!.doctorID !=
|
|
|
|
|
model.patientProgressNoteList[index].createdBy
|
|
|
|
|
? Color(0xFFCC9B14)
|
|
|
|
|
: model.patientProgressNoteList[index].status == 4
|
|
|
|
|
? Colors.red.shade700
|
|
|
|
|
: model.patientProgressNoteList[index].status == 2
|
|
|
|
|
? Colors.green[600]!
|
|
|
|
|
: Color(0xFFCC9B14)!,
|
|
|
|
|
widget: Column(
|
|
|
|
|
children: [
|
|
|
|
|
Column(
|
|
|
|
|
crossAxisAlignment: CrossAxisAlignment.start,
|
|
|
|
|
children: [
|
|
|
|
|
if (model.patientProgressNoteList[index].status == 1 &&
|
|
|
|
|
authenticationViewModel!.doctorProfile!.doctorID !=
|
|
|
|
|
model.patientProgressNoteList[index].createdBy)
|
|
|
|
|
AppText(
|
|
|
|
|
TranslationBase.of(context).notePending,
|
|
|
|
|
fontWeight: FontWeight.bold,
|
|
|
|
|
color: Color(0xFFCC9B14),
|
|
|
|
|
fontSize: 12,
|
|
|
|
|
),
|
|
|
|
|
if (model.patientProgressNoteList[index].status == 4)
|
|
|
|
|
AppText(
|
|
|
|
|
TranslationBase.of(context).noteCanceled,
|
|
|
|
|
fontWeight: FontWeight.bold,
|
|
|
|
|
color: Colors.red.shade700,
|
|
|
|
|
fontSize: 12,
|
|
|
|
|
),
|
|
|
|
|
if (model.patientProgressNoteList[index].status == 2)
|
|
|
|
|
AppText(
|
|
|
|
|
TranslationBase.of(context).noteVerified,
|
|
|
|
|
fontWeight: FontWeight.bold,
|
|
|
|
|
color: Colors.green[600],
|
|
|
|
|
fontSize: 12,
|
|
|
|
|
),
|
|
|
|
|
if (model.patientProgressNoteList[index].status != 2 &&
|
|
|
|
|
model.patientProgressNoteList[index].status != 4 &&
|
|
|
|
|
authenticationViewModel!.doctorProfile!.doctorID ==
|
|
|
|
|
model.patientProgressNoteList[index].createdBy)
|
|
|
|
|
Row(
|
|
|
|
|
crossAxisAlignment: CrossAxisAlignment.start,
|
|
|
|
|
children: [
|
|
|
|
|
InkWell(
|
|
|
|
|
onTap: () {
|
|
|
|
|
Navigator.push(
|
|
|
|
|
context,
|
|
|
|
|
MaterialPageRoute(
|
|
|
|
|
builder: (context) => UpdateNoteOrder(
|
|
|
|
|
note: model.patientProgressNoteList[index],
|
|
|
|
|
patientModel: model,
|
|
|
|
|
patient: patient,
|
|
|
|
|
visitType: widget.visitType,
|
|
|
|
|
isUpdate: true,
|
|
|
|
|
)),
|
|
|
|
|
);
|
|
|
|
|
},
|
|
|
|
|
child: Container(
|
|
|
|
|
decoration: BoxDecoration(
|
|
|
|
|
color: Colors.grey[600],
|
|
|
|
|
borderRadius: BorderRadius.circular(10),
|
|
|
|
|
),
|
|
|
|
|
// color:Colors.red[600],
|
|
|
|
|
|
|
|
|
|
child: Row(
|
|
|
|
|
children: [
|
|
|
|
|
Icon(
|
|
|
|
|
DoctorApp.edit_1,
|
|
|
|
|
size: 12,
|
|
|
|
|
color: Colors.white,
|
|
|
|
|
),
|
|
|
|
|
SizedBox(
|
|
|
|
|
width: 2,
|
|
|
|
|
),
|
|
|
|
|
AppText(
|
|
|
|
|
TranslationBase.of(context).update,
|
|
|
|
|
fontSize: 10,
|
|
|
|
|
color: Colors.white,
|
|
|
|
|
),
|
|
|
|
|
],
|
|
|
|
|
child: Row(
|
|
|
|
|
children: [
|
|
|
|
|
Icon(
|
|
|
|
|
DoctorApp.edit_1,
|
|
|
|
|
size: 12,
|
|
|
|
|
color: Colors.white,
|
|
|
|
|
),
|
|
|
|
|
SizedBox(
|
|
|
|
|
width: 2,
|
|
|
|
|
),
|
|
|
|
|
AppText(
|
|
|
|
|
TranslationBase.of(context).update,
|
|
|
|
|
fontSize: 10,
|
|
|
|
|
color: Colors.white,
|
|
|
|
|
),
|
|
|
|
|
],
|
|
|
|
|
),
|
|
|
|
|
padding: EdgeInsets.all(6),
|
|
|
|
|
),
|
|
|
|
|
padding: EdgeInsets.all(6),
|
|
|
|
|
),
|
|
|
|
|
),
|
|
|
|
|
SizedBox(
|
|
|
|
|
width: 10,
|
|
|
|
|
),
|
|
|
|
|
InkWell(
|
|
|
|
|
onTap: () async {
|
|
|
|
|
showMyDialog(
|
|
|
|
|
context: context,
|
|
|
|
|
actionName: "verify",
|
|
|
|
|
confirmFun: () async {
|
|
|
|
|
GifLoaderDialogUtils.showMyDialog(context);
|
|
|
|
|
UpdateNoteReqModel reqModel = UpdateNoteReqModel(
|
|
|
|
|
admissionNo: int.parse(patient.admissionNo ?? ""),
|
|
|
|
|
cancelledNote: false,
|
|
|
|
|
lineItemNo: model.patientProgressNoteList[index].lineItemNo,
|
|
|
|
|
createdBy: model.patientProgressNoteList[index].createdBy,
|
|
|
|
|
notes: model.patientProgressNoteList[index].notes,
|
|
|
|
|
verifiedNote: true,
|
|
|
|
|
patientTypeID: patient.patientType,
|
|
|
|
|
patientOutSA: false,
|
|
|
|
|
);
|
|
|
|
|
await model.updatePatientProgressNote(reqModel);
|
|
|
|
|
await getProgressNoteList(context, model, isLocalBusy: true);
|
|
|
|
|
GifLoaderDialogUtils.hideDialog(context);
|
|
|
|
|
});
|
|
|
|
|
},
|
|
|
|
|
child: Container(
|
|
|
|
|
decoration: BoxDecoration(
|
|
|
|
|
color: Colors.green[600],
|
|
|
|
|
borderRadius: BorderRadius.circular(10),
|
|
|
|
|
),
|
|
|
|
|
// color:Colors.red[600],
|
|
|
|
|
SizedBox(
|
|
|
|
|
width: 10,
|
|
|
|
|
),
|
|
|
|
|
InkWell(
|
|
|
|
|
onTap: () async {
|
|
|
|
|
showMyDialog(
|
|
|
|
|
context: context,
|
|
|
|
|
actionName: "verify",
|
|
|
|
|
confirmFun: () async {
|
|
|
|
|
GifLoaderDialogUtils.showMyDialog(context);
|
|
|
|
|
UpdateNoteReqModel reqModel = UpdateNoteReqModel(
|
|
|
|
|
admissionNo: int.parse(patient.admissionNo ?? ""),
|
|
|
|
|
cancelledNote: false,
|
|
|
|
|
lineItemNo:
|
|
|
|
|
model.patientProgressNoteList[index].lineItemNo,
|
|
|
|
|
createdBy: model.patientProgressNoteList[index].createdBy,
|
|
|
|
|
notes: model.patientProgressNoteList[index].notes,
|
|
|
|
|
verifiedNote: true,
|
|
|
|
|
patientTypeID: patient.patientType,
|
|
|
|
|
patientOutSA: false,
|
|
|
|
|
);
|
|
|
|
|
await model.updatePatientProgressNote(reqModel);
|
|
|
|
|
await getProgressNoteList(context, model,
|
|
|
|
|
isLocalBusy: true);
|
|
|
|
|
GifLoaderDialogUtils.hideDialog(context);
|
|
|
|
|
});
|
|
|
|
|
},
|
|
|
|
|
child: Container(
|
|
|
|
|
decoration: BoxDecoration(
|
|
|
|
|
color: Colors.green[600],
|
|
|
|
|
borderRadius: BorderRadius.circular(10),
|
|
|
|
|
),
|
|
|
|
|
// color:Colors.red[600],
|
|
|
|
|
|
|
|
|
|
child: Row(
|
|
|
|
|
children: [
|
|
|
|
|
Icon(
|
|
|
|
|
FontAwesomeIcons.check,
|
|
|
|
|
size: 12,
|
|
|
|
|
color: Colors.white,
|
|
|
|
|
),
|
|
|
|
|
SizedBox(
|
|
|
|
|
width: 2,
|
|
|
|
|
),
|
|
|
|
|
AppText(
|
|
|
|
|
TranslationBase.of(context).noteVerify,
|
|
|
|
|
fontSize: 10,
|
|
|
|
|
color: Colors.white,
|
|
|
|
|
),
|
|
|
|
|
],
|
|
|
|
|
child: Row(
|
|
|
|
|
children: [
|
|
|
|
|
Icon(
|
|
|
|
|
FontAwesomeIcons.check,
|
|
|
|
|
size: 12,
|
|
|
|
|
color: Colors.white,
|
|
|
|
|
),
|
|
|
|
|
SizedBox(
|
|
|
|
|
width: 2,
|
|
|
|
|
),
|
|
|
|
|
AppText(
|
|
|
|
|
TranslationBase.of(context).noteVerify,
|
|
|
|
|
fontSize: 10,
|
|
|
|
|
color: Colors.white,
|
|
|
|
|
),
|
|
|
|
|
],
|
|
|
|
|
),
|
|
|
|
|
padding: EdgeInsets.all(6),
|
|
|
|
|
),
|
|
|
|
|
padding: EdgeInsets.all(6),
|
|
|
|
|
),
|
|
|
|
|
),
|
|
|
|
|
SizedBox(
|
|
|
|
|
width: 10,
|
|
|
|
|
),
|
|
|
|
|
InkWell(
|
|
|
|
|
onTap: () async {
|
|
|
|
|
showMyDialog(
|
|
|
|
|
context: context,
|
|
|
|
|
actionName: TranslationBase.of(context).cancel!,
|
|
|
|
|
confirmFun: () async {
|
|
|
|
|
GifLoaderDialogUtils.showMyDialog(
|
|
|
|
|
context,
|
|
|
|
|
);
|
|
|
|
|
UpdateNoteReqModel reqModel = UpdateNoteReqModel(
|
|
|
|
|
admissionNo: int.parse(patient.admissionNo ?? ""),
|
|
|
|
|
cancelledNote: true,
|
|
|
|
|
lineItemNo: model.patientProgressNoteList[index].lineItemNo,
|
|
|
|
|
createdBy: model.patientProgressNoteList[index].createdBy,
|
|
|
|
|
notes: model.patientProgressNoteList[index].notes,
|
|
|
|
|
verifiedNote: false,
|
|
|
|
|
patientTypeID: patient.patientType,
|
|
|
|
|
patientOutSA: false,
|
|
|
|
|
);
|
|
|
|
|
await model.updatePatientProgressNote(reqModel);
|
|
|
|
|
await getProgressNoteList(context, model, isLocalBusy: true);
|
|
|
|
|
GifLoaderDialogUtils.hideDialog(context);
|
|
|
|
|
});
|
|
|
|
|
},
|
|
|
|
|
child: Container(
|
|
|
|
|
decoration: BoxDecoration(
|
|
|
|
|
color: Colors.red[600],
|
|
|
|
|
borderRadius: BorderRadius.circular(10),
|
|
|
|
|
),
|
|
|
|
|
// color:Colors.red[600],
|
|
|
|
|
SizedBox(
|
|
|
|
|
width: 10,
|
|
|
|
|
),
|
|
|
|
|
InkWell(
|
|
|
|
|
onTap: () async {
|
|
|
|
|
showMyDialog(
|
|
|
|
|
context: context,
|
|
|
|
|
actionName: TranslationBase.of(context).cancel!,
|
|
|
|
|
confirmFun: () async {
|
|
|
|
|
GifLoaderDialogUtils.showMyDialog(
|
|
|
|
|
context,
|
|
|
|
|
);
|
|
|
|
|
UpdateNoteReqModel reqModel = UpdateNoteReqModel(
|
|
|
|
|
admissionNo: int.parse(patient.admissionNo ?? ""),
|
|
|
|
|
cancelledNote: true,
|
|
|
|
|
lineItemNo:
|
|
|
|
|
model.patientProgressNoteList[index].lineItemNo,
|
|
|
|
|
createdBy: model.patientProgressNoteList[index].createdBy,
|
|
|
|
|
notes: model.patientProgressNoteList[index].notes,
|
|
|
|
|
verifiedNote: false,
|
|
|
|
|
patientTypeID: patient.patientType,
|
|
|
|
|
patientOutSA: false,
|
|
|
|
|
);
|
|
|
|
|
await model.updatePatientProgressNote(reqModel);
|
|
|
|
|
await getProgressNoteList(context, model,
|
|
|
|
|
isLocalBusy: true);
|
|
|
|
|
GifLoaderDialogUtils.hideDialog(context);
|
|
|
|
|
});
|
|
|
|
|
},
|
|
|
|
|
child: Container(
|
|
|
|
|
decoration: BoxDecoration(
|
|
|
|
|
color: Colors.red[600],
|
|
|
|
|
borderRadius: BorderRadius.circular(10),
|
|
|
|
|
),
|
|
|
|
|
// color:Colors.red[600],
|
|
|
|
|
|
|
|
|
|
child: Row(
|
|
|
|
|
children: [
|
|
|
|
|
Icon(
|
|
|
|
|
FontAwesomeIcons.trash,
|
|
|
|
|
size: 12,
|
|
|
|
|
color: Colors.white,
|
|
|
|
|
),
|
|
|
|
|
SizedBox(
|
|
|
|
|
width: 2,
|
|
|
|
|
),
|
|
|
|
|
AppText(
|
|
|
|
|
'Cancel',
|
|
|
|
|
fontSize: 10,
|
|
|
|
|
color: Colors.white,
|
|
|
|
|
),
|
|
|
|
|
],
|
|
|
|
|
child: Row(
|
|
|
|
|
children: [
|
|
|
|
|
Icon(
|
|
|
|
|
FontAwesomeIcons.trash,
|
|
|
|
|
size: 12,
|
|
|
|
|
color: Colors.white,
|
|
|
|
|
),
|
|
|
|
|
SizedBox(
|
|
|
|
|
width: 2,
|
|
|
|
|
),
|
|
|
|
|
AppText(
|
|
|
|
|
'Cancel',
|
|
|
|
|
fontSize: 10,
|
|
|
|
|
color: Colors.white,
|
|
|
|
|
),
|
|
|
|
|
],
|
|
|
|
|
),
|
|
|
|
|
padding: EdgeInsets.all(6),
|
|
|
|
|
),
|
|
|
|
|
padding: EdgeInsets.all(6),
|
|
|
|
|
),
|
|
|
|
|
),
|
|
|
|
|
SizedBox(
|
|
|
|
|
width: 10,
|
|
|
|
|
)
|
|
|
|
|
],
|
|
|
|
|
SizedBox(
|
|
|
|
|
width: 10,
|
|
|
|
|
)
|
|
|
|
|
],
|
|
|
|
|
),
|
|
|
|
|
SizedBox(
|
|
|
|
|
height: 10,
|
|
|
|
|
),
|
|
|
|
|
SizedBox(
|
|
|
|
|
height: 10,
|
|
|
|
|
),
|
|
|
|
|
Row(
|
|
|
|
|
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
|
|
|
|
crossAxisAlignment: CrossAxisAlignment.start,
|
|
|
|
|
children: [
|
|
|
|
|
Container(
|
|
|
|
|
width: MediaQuery.of(context).size.width * 0.60,
|
|
|
|
|
child: Column(
|
|
|
|
|
crossAxisAlignment: CrossAxisAlignment.start,
|
|
|
|
|
children: [
|
|
|
|
|
Row(
|
|
|
|
|
crossAxisAlignment: CrossAxisAlignment.start,
|
|
|
|
|
children: [
|
|
|
|
|
AppText(
|
|
|
|
|
TranslationBase.of(context).createdBy,
|
|
|
|
|
fontSize: 10,
|
|
|
|
|
),
|
|
|
|
|
Expanded(
|
|
|
|
|
child: AppText(
|
|
|
|
|
model.patientProgressNoteList[index].doctorName ?? '',
|
|
|
|
|
fontWeight: FontWeight.w600,
|
|
|
|
|
fontSize: 12,
|
|
|
|
|
Row(
|
|
|
|
|
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
|
|
|
|
crossAxisAlignment: CrossAxisAlignment.start,
|
|
|
|
|
children: [
|
|
|
|
|
Container(
|
|
|
|
|
width: MediaQuery.of(context).size.width * 0.60,
|
|
|
|
|
child: Column(
|
|
|
|
|
crossAxisAlignment: CrossAxisAlignment.start,
|
|
|
|
|
children: [
|
|
|
|
|
Row(
|
|
|
|
|
crossAxisAlignment: CrossAxisAlignment.start,
|
|
|
|
|
children: [
|
|
|
|
|
AppText(
|
|
|
|
|
TranslationBase.of(context).createdBy,
|
|
|
|
|
fontSize: 10,
|
|
|
|
|
),
|
|
|
|
|
),
|
|
|
|
|
],
|
|
|
|
|
Expanded(
|
|
|
|
|
child: AppText(
|
|
|
|
|
model.patientProgressNoteList[index].doctorName ?? '',
|
|
|
|
|
fontWeight: FontWeight.w600,
|
|
|
|
|
fontSize: 12,
|
|
|
|
|
),
|
|
|
|
|
),
|
|
|
|
|
],
|
|
|
|
|
),
|
|
|
|
|
],
|
|
|
|
|
),
|
|
|
|
|
),
|
|
|
|
|
Column(
|
|
|
|
|
children: [
|
|
|
|
|
AppText(
|
|
|
|
|
model.patientProgressNoteList[index].createdOn != null
|
|
|
|
|
? AppDateUtils.getDayMonthYearDateFormatted(
|
|
|
|
|
AppDateUtils.getDateTimeFromServerFormat(
|
|
|
|
|
model.patientProgressNoteList[index].createdOn ?? ""),
|
|
|
|
|
isArabic: projectViewModel!.isArabic)
|
|
|
|
|
: AppDateUtils.getDayMonthYearDateFormatted(DateTime.now(),
|
|
|
|
|
isArabic: projectViewModel!.isArabic),
|
|
|
|
|
fontWeight: FontWeight.w600,
|
|
|
|
|
fontSize: 14,
|
|
|
|
|
),
|
|
|
|
|
AppText(
|
|
|
|
|
model.patientProgressNoteList[index].createdOn != null
|
|
|
|
|
? AppDateUtils.getHour(
|
|
|
|
|
AppDateUtils.getDateTimeFromServerFormat(
|
|
|
|
|
model.patientProgressNoteList[index].createdOn ?? ""))
|
|
|
|
|
: AppDateUtils.getHour(DateTime.now()),
|
|
|
|
|
fontWeight: FontWeight.w600,
|
|
|
|
|
fontSize: 14,
|
|
|
|
|
),
|
|
|
|
|
],
|
|
|
|
|
crossAxisAlignment: CrossAxisAlignment.end,
|
|
|
|
|
)
|
|
|
|
|
],
|
|
|
|
|
),
|
|
|
|
|
SizedBox(
|
|
|
|
|
height: 8,
|
|
|
|
|
),
|
|
|
|
|
Row(mainAxisAlignment: MainAxisAlignment.start, children: [
|
|
|
|
|
Expanded(
|
|
|
|
|
child: AppText(
|
|
|
|
|
model.patientProgressNoteList[index].notes,
|
|
|
|
|
fontSize: 10,
|
|
|
|
|
),
|
|
|
|
|
),
|
|
|
|
|
Column(
|
|
|
|
|
children: [
|
|
|
|
|
AppText(
|
|
|
|
|
model.patientProgressNoteList[index].createdOn != null
|
|
|
|
|
? AppDateUtils.getDayMonthYearDateFormatted(
|
|
|
|
|
AppDateUtils.getDateTimeFromServerFormat(
|
|
|
|
|
model.patientProgressNoteList[index].createdOn ?? ""),
|
|
|
|
|
isArabic: projectViewModel!.isArabic)
|
|
|
|
|
: AppDateUtils.getDayMonthYearDateFormatted(DateTime.now(),
|
|
|
|
|
isArabic: projectViewModel!.isArabic),
|
|
|
|
|
fontWeight: FontWeight.w600,
|
|
|
|
|
fontSize: 14,
|
|
|
|
|
),
|
|
|
|
|
AppText(
|
|
|
|
|
model.patientProgressNoteList[index].createdOn != null
|
|
|
|
|
? AppDateUtils.getHour(AppDateUtils.getDateTimeFromServerFormat(
|
|
|
|
|
model.patientProgressNoteList[index].createdOn ?? ""))
|
|
|
|
|
: AppDateUtils.getHour(DateTime.now()),
|
|
|
|
|
fontWeight: FontWeight.w600,
|
|
|
|
|
fontSize: 14,
|
|
|
|
|
),
|
|
|
|
|
],
|
|
|
|
|
crossAxisAlignment: CrossAxisAlignment.end,
|
|
|
|
|
)
|
|
|
|
|
],
|
|
|
|
|
),
|
|
|
|
|
SizedBox(
|
|
|
|
|
height: 8,
|
|
|
|
|
),
|
|
|
|
|
Row(mainAxisAlignment: MainAxisAlignment.start, children: [
|
|
|
|
|
Expanded(
|
|
|
|
|
child: AppText(
|
|
|
|
|
model.patientProgressNoteList[index].notes,
|
|
|
|
|
fontSize: 10,
|
|
|
|
|
),
|
|
|
|
|
),
|
|
|
|
|
])
|
|
|
|
|
],
|
|
|
|
|
),
|
|
|
|
|
SizedBox(
|
|
|
|
|
height: 20,
|
|
|
|
|
),
|
|
|
|
|
],
|
|
|
|
|
])
|
|
|
|
|
],
|
|
|
|
|
),
|
|
|
|
|
SizedBox(
|
|
|
|
|
height: 20,
|
|
|
|
|
),
|
|
|
|
|
],
|
|
|
|
|
),
|
|
|
|
|
),
|
|
|
|
|
),
|
|
|
|
|
);
|
|
|
|
|
}),
|
|
|
|
|
);
|
|
|
|
|
}),
|
|
|
|
|
),
|
|
|
|
|
),
|
|
|
|
|
),
|
|
|
|
|
],
|
|
|
|
|
),
|
|
|
|
|
),
|
|
|
|
|
|