|
|
|
@ -1,4 +1,3 @@
|
|
|
|
import 'package:doctor_app_flutter/config/config.dart';
|
|
|
|
|
|
|
|
import 'package:doctor_app_flutter/config/shared_pref_kay.dart';
|
|
|
|
import 'package:doctor_app_flutter/config/shared_pref_kay.dart';
|
|
|
|
import 'package:doctor_app_flutter/core/model/note/note_model.dart';
|
|
|
|
import 'package:doctor_app_flutter/core/model/note/note_model.dart';
|
|
|
|
import 'package:doctor_app_flutter/core/model/note/update_note_model.dart';
|
|
|
|
import 'package:doctor_app_flutter/core/model/note/update_note_model.dart';
|
|
|
|
@ -35,22 +34,21 @@ DrAppSharedPreferances sharedPref = new DrAppSharedPreferances();
|
|
|
|
class ProgressNoteScreen extends StatefulWidget {
|
|
|
|
class ProgressNoteScreen extends StatefulWidget {
|
|
|
|
final int visitType;
|
|
|
|
final int visitType;
|
|
|
|
|
|
|
|
|
|
|
|
const ProgressNoteScreen({Key ? key, this.visitType}) : super(key: key);
|
|
|
|
const ProgressNoteScreen({Key? key, required this.visitType}) : super(key: key);
|
|
|
|
|
|
|
|
|
|
|
|
@override
|
|
|
|
@override
|
|
|
|
_ProgressNoteState createState() => _ProgressNoteState();
|
|
|
|
_ProgressNoteState createState() => _ProgressNoteState();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
class _ProgressNoteState extends State<ProgressNoteScreen> {
|
|
|
|
class _ProgressNoteState extends State<ProgressNoteScreen> {
|
|
|
|
List<NoteModel> notesList;
|
|
|
|
late List<NoteModel> notesList;
|
|
|
|
var filteredNotesList;
|
|
|
|
var filteredNotesList;
|
|
|
|
bool isDischargedPatient = false;
|
|
|
|
bool isDischargedPatient = false;
|
|
|
|
AuthenticationViewModel authenticationViewModel;
|
|
|
|
late AuthenticationViewModel authenticationViewModel;
|
|
|
|
ProjectViewModel projectViewModel;
|
|
|
|
late ProjectViewModel projectViewModel;
|
|
|
|
|
|
|
|
|
|
|
|
getProgressNoteList(BuildContext context, PatientViewModel model,
|
|
|
|
getProgressNoteList(BuildContext context, PatientViewModel model, {bool isLocalBusy = false}) async {
|
|
|
|
{bool isLocalBusy = false}) async {
|
|
|
|
final routeArgs = ModalRoute.of(context)!.settings.arguments as Map;
|
|
|
|
final routeArgs = ModalRoute.of(context).settings.arguments as Map;
|
|
|
|
|
|
|
|
PatiantInformtion patient = routeArgs['patient'];
|
|
|
|
PatiantInformtion patient = routeArgs['patient'];
|
|
|
|
String token = await sharedPref.getString(TOKEN);
|
|
|
|
String token = await sharedPref.getString(TOKEN);
|
|
|
|
String type = await sharedPref.getString(SLECTED_PATIENT_TYPE);
|
|
|
|
String type = await sharedPref.getString(SLECTED_PATIENT_TYPE);
|
|
|
|
@ -59,15 +57,12 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
|
|
|
|
ProgressNoteRequest progressNoteRequest = ProgressNoteRequest(
|
|
|
|
ProgressNoteRequest progressNoteRequest = ProgressNoteRequest(
|
|
|
|
visitType: widget.visitType,
|
|
|
|
visitType: widget.visitType,
|
|
|
|
// if equal 5 then this will return progress note
|
|
|
|
// if equal 5 then this will return progress note
|
|
|
|
admissionNo: int.parse(patient!.admissionNo!),
|
|
|
|
admissionNo: int.parse(patient.admissionNo ?? ""),
|
|
|
|
projectID: patient.projectId,
|
|
|
|
projectID: patient.projectId,
|
|
|
|
tokenID: token,
|
|
|
|
tokenID: token,
|
|
|
|
patientTypeID: patient.patientType,
|
|
|
|
patientTypeID: patient.patientType,
|
|
|
|
languageID: 2);
|
|
|
|
languageID: 2);
|
|
|
|
model
|
|
|
|
model.getPatientProgressNote(progressNoteRequest.toJson(), isLocalBusy: isLocalBusy).then((c) {
|
|
|
|
.getPatientProgressNote(progressNoteRequest.toJson(),
|
|
|
|
|
|
|
|
isLocalBusy: isLocalBusy)
|
|
|
|
|
|
|
|
.then((c) {
|
|
|
|
|
|
|
|
notesList = model.patientProgressNoteList;
|
|
|
|
notesList = model.patientProgressNoteList;
|
|
|
|
});
|
|
|
|
});
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -76,11 +71,10 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
|
|
|
|
Widget build(BuildContext context) {
|
|
|
|
Widget build(BuildContext context) {
|
|
|
|
authenticationViewModel = Provider.of(context);
|
|
|
|
authenticationViewModel = Provider.of(context);
|
|
|
|
projectViewModel = Provider.of(context);
|
|
|
|
projectViewModel = Provider.of(context);
|
|
|
|
final routeArgs = ModalRoute.of(context).settings.arguments as Map;
|
|
|
|
final routeArgs = ModalRoute.of(context)!.settings.arguments as Map;
|
|
|
|
PatiantInformtion patient = routeArgs['patient'];
|
|
|
|
PatiantInformtion patient = routeArgs['patient'];
|
|
|
|
String arrivalType = routeArgs['arrivalType'];
|
|
|
|
String arrivalType = routeArgs['arrivalType'];
|
|
|
|
if (routeArgs.containsKey('isDischargedPatient'))
|
|
|
|
if (routeArgs.containsKey('isDischargedPatient')) isDischargedPatient = routeArgs['isDischargedPatient'];
|
|
|
|
isDischargedPatient = routeArgs['isDischargedPatient'];
|
|
|
|
|
|
|
|
return BaseView<PatientViewModel>(
|
|
|
|
return BaseView<PatientViewModel>(
|
|
|
|
onModelReady: (model) => getProgressNoteList(context, model),
|
|
|
|
onModelReady: (model) => getProgressNoteList(context, model),
|
|
|
|
builder: (_, model, w) => AppScaffold(
|
|
|
|
builder: (_, model, w) => AppScaffold(
|
|
|
|
@ -94,7 +88,7 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
|
|
|
|
body: model.patientProgressNoteList == null ||
|
|
|
|
body: model.patientProgressNoteList == null ||
|
|
|
|
model.patientProgressNoteList.length == 0
|
|
|
|
model.patientProgressNoteList.length == 0
|
|
|
|
? DrAppEmbeddedError(
|
|
|
|
? DrAppEmbeddedError(
|
|
|
|
error: TranslationBase.of(context).errorNoProgressNote)
|
|
|
|
error: TranslationBase.of(context).errorNoProgressNote!)
|
|
|
|
: Container(
|
|
|
|
: Container(
|
|
|
|
color: Colors.grey[200],
|
|
|
|
color: Colors.grey[200],
|
|
|
|
child: Column(
|
|
|
|
child: Column(
|
|
|
|
@ -120,8 +114,8 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
|
|
|
|
);
|
|
|
|
);
|
|
|
|
},
|
|
|
|
},
|
|
|
|
label: widget.visitType == 3
|
|
|
|
label: widget.visitType == 3
|
|
|
|
? TranslationBase.of(context).addNewOrderSheet
|
|
|
|
? TranslationBase.of(context).addNewOrderSheet!
|
|
|
|
: TranslationBase.of(context).addProgressNote,
|
|
|
|
: TranslationBase.of(context).addProgressNote!,
|
|
|
|
),
|
|
|
|
),
|
|
|
|
Expanded(
|
|
|
|
Expanded(
|
|
|
|
child: Container(
|
|
|
|
child: Container(
|
|
|
|
@ -149,7 +143,7 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
|
|
|
|
: model.patientProgressNoteList[index]
|
|
|
|
: model.patientProgressNoteList[index]
|
|
|
|
.status ==
|
|
|
|
.status ==
|
|
|
|
2
|
|
|
|
2
|
|
|
|
? AppGlobal.appGreenColor
|
|
|
|
? Colors.green[600]!
|
|
|
|
: Color(0xFFCC9B14),
|
|
|
|
: Color(0xFFCC9B14),
|
|
|
|
widget: Column(
|
|
|
|
widget: Column(
|
|
|
|
children: [
|
|
|
|
children: [
|
|
|
|
@ -198,7 +192,7 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
|
|
|
|
TranslationBase.of(context)
|
|
|
|
TranslationBase.of(context)
|
|
|
|
.noteVerified,
|
|
|
|
.noteVerified,
|
|
|
|
fontWeight: FontWeight.bold,
|
|
|
|
fontWeight: FontWeight.bold,
|
|
|
|
color: AppGlobal.appGreenColor,
|
|
|
|
color: Colors.green[600],
|
|
|
|
fontSize: 12,
|
|
|
|
fontSize: 12,
|
|
|
|
),
|
|
|
|
),
|
|
|
|
if (model.patientProgressNoteList[index].status != 2 &&
|
|
|
|
if (model.patientProgressNoteList[index].status != 2 &&
|
|
|
|
@ -257,9 +251,7 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
|
|
|
|
width: 2,
|
|
|
|
width: 2,
|
|
|
|
),
|
|
|
|
),
|
|
|
|
AppText(
|
|
|
|
AppText(
|
|
|
|
TranslationBase.of(
|
|
|
|
TranslationBase.of(context).update,
|
|
|
|
context)
|
|
|
|
|
|
|
|
.update,
|
|
|
|
|
|
|
|
fontSize: 10,
|
|
|
|
fontSize: 10,
|
|
|
|
color: Colors.white,
|
|
|
|
color: Colors.white,
|
|
|
|
),
|
|
|
|
),
|
|
|
|
@ -277,61 +269,35 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
|
|
|
|
context: context,
|
|
|
|
context: context,
|
|
|
|
actionName: "verify",
|
|
|
|
actionName: "verify",
|
|
|
|
confirmFun: () async {
|
|
|
|
confirmFun: () async {
|
|
|
|
GifLoaderDialogUtils
|
|
|
|
GifLoaderDialogUtils.showMyDialog(context);
|
|
|
|
.showMyDialog(
|
|
|
|
UpdateNoteReqModel reqModel = UpdateNoteReqModel(
|
|
|
|
context);
|
|
|
|
admissionNo: int.parse(patient.admissionNo ?? ""),
|
|
|
|
UpdateNoteReqModel
|
|
|
|
cancelledNote: false,
|
|
|
|
reqModel =
|
|
|
|
lineItemNo:
|
|
|
|
UpdateNoteReqModel(
|
|
|
|
model.patientProgressNoteList[index].lineItemNo,
|
|
|
|
admissionNo: int
|
|
|
|
createdBy: model.patientProgressNoteList[index].createdBy,
|
|
|
|
.parse(patient
|
|
|
|
notes: model.patientProgressNoteList[index].notes,
|
|
|
|
.admissionNo),
|
|
|
|
|
|
|
|
cancelledNote:
|
|
|
|
|
|
|
|
false,
|
|
|
|
|
|
|
|
lineItemNo: model
|
|
|
|
|
|
|
|
.patientProgressNoteList[
|
|
|
|
|
|
|
|
index]
|
|
|
|
|
|
|
|
.lineItemNo,
|
|
|
|
|
|
|
|
createdBy: model
|
|
|
|
|
|
|
|
.patientProgressNoteList[
|
|
|
|
|
|
|
|
index]
|
|
|
|
|
|
|
|
.createdBy,
|
|
|
|
|
|
|
|
notes: model
|
|
|
|
|
|
|
|
.patientProgressNoteList[
|
|
|
|
|
|
|
|
index]
|
|
|
|
|
|
|
|
.notes,
|
|
|
|
|
|
|
|
verifiedNote: true,
|
|
|
|
verifiedNote: true,
|
|
|
|
patientTypeID:
|
|
|
|
patientTypeID: patient.patientType,
|
|
|
|
patient
|
|
|
|
|
|
|
|
.patientType,
|
|
|
|
|
|
|
|
patientOutSA: false,
|
|
|
|
patientOutSA: false,
|
|
|
|
);
|
|
|
|
);
|
|
|
|
await model
|
|
|
|
await model.updatePatientProgressNote(reqModel);
|
|
|
|
.updatePatientProgressNote(
|
|
|
|
await getProgressNoteList(context, model,
|
|
|
|
reqModel);
|
|
|
|
isLocalBusy: true);
|
|
|
|
await getProgressNoteList(
|
|
|
|
GifLoaderDialogUtils.hideDialog(context);
|
|
|
|
context, model,
|
|
|
|
|
|
|
|
isLocalBusy:
|
|
|
|
|
|
|
|
true);
|
|
|
|
|
|
|
|
GifLoaderDialogUtils
|
|
|
|
|
|
|
|
.hideDialog(
|
|
|
|
|
|
|
|
context);
|
|
|
|
|
|
|
|
});
|
|
|
|
});
|
|
|
|
},
|
|
|
|
},
|
|
|
|
child: Container(
|
|
|
|
child: Container(
|
|
|
|
decoration: BoxDecoration(
|
|
|
|
decoration: BoxDecoration(
|
|
|
|
color: AppGlobal.appGreenColor,
|
|
|
|
color: Colors.green[600],
|
|
|
|
borderRadius:
|
|
|
|
borderRadius: BorderRadius.circular(10),
|
|
|
|
BorderRadius.circular(
|
|
|
|
|
|
|
|
10),
|
|
|
|
|
|
|
|
),
|
|
|
|
),
|
|
|
|
// color:Colors.red[600],
|
|
|
|
// color:Colors.red[600],
|
|
|
|
|
|
|
|
|
|
|
|
child: Row(
|
|
|
|
child: Row(
|
|
|
|
children: [
|
|
|
|
children: [
|
|
|
|
Icon(
|
|
|
|
Icon(
|
|
|
|
FontAwesomeIcons
|
|
|
|
FontAwesomeIcons.check,
|
|
|
|
.check,
|
|
|
|
|
|
|
|
size: 12,
|
|
|
|
size: 12,
|
|
|
|
color: Colors.white,
|
|
|
|
color: Colors.white,
|
|
|
|
),
|
|
|
|
),
|
|
|
|
@ -339,9 +305,7 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
|
|
|
|
width: 2,
|
|
|
|
width: 2,
|
|
|
|
),
|
|
|
|
),
|
|
|
|
AppText(
|
|
|
|
AppText(
|
|
|
|
TranslationBase.of(
|
|
|
|
TranslationBase.of(context).noteVerify,
|
|
|
|
context)
|
|
|
|
|
|
|
|
.noteVerify,
|
|
|
|
|
|
|
|
fontSize: 10,
|
|
|
|
fontSize: 10,
|
|
|
|
color: Colors.white,
|
|
|
|
color: Colors.white,
|
|
|
|
),
|
|
|
|
),
|
|
|
|
@ -357,66 +321,39 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
|
|
|
|
onTap: () async {
|
|
|
|
onTap: () async {
|
|
|
|
showMyDialog(
|
|
|
|
showMyDialog(
|
|
|
|
context: context,
|
|
|
|
context: context,
|
|
|
|
actionName:
|
|
|
|
actionName: TranslationBase.of(context).cancel!,
|
|
|
|
TranslationBase.of(
|
|
|
|
|
|
|
|
context)
|
|
|
|
|
|
|
|
.cancel,
|
|
|
|
|
|
|
|
confirmFun: () async {
|
|
|
|
confirmFun: () async {
|
|
|
|
GifLoaderDialogUtils
|
|
|
|
GifLoaderDialogUtils.showMyDialog(
|
|
|
|
.showMyDialog(
|
|
|
|
|
|
|
|
context,
|
|
|
|
context,
|
|
|
|
);
|
|
|
|
);
|
|
|
|
UpdateNoteReqModel
|
|
|
|
UpdateNoteReqModel reqModel = UpdateNoteReqModel(
|
|
|
|
reqModel =
|
|
|
|
admissionNo: int.parse(patient.admissionNo ?? ""),
|
|
|
|
UpdateNoteReqModel(
|
|
|
|
|
|
|
|
admissionNo: int
|
|
|
|
|
|
|
|
.parse(patient
|
|
|
|
|
|
|
|
.admissionNo),
|
|
|
|
|
|
|
|
cancelledNote: true,
|
|
|
|
cancelledNote: true,
|
|
|
|
lineItemNo: model
|
|
|
|
lineItemNo:
|
|
|
|
.patientProgressNoteList[
|
|
|
|
model.patientProgressNoteList[index].lineItemNo,
|
|
|
|
index]
|
|
|
|
createdBy: model.patientProgressNoteList[index].createdBy,
|
|
|
|
.lineItemNo,
|
|
|
|
notes: model.patientProgressNoteList[index].notes,
|
|
|
|
createdBy: model
|
|
|
|
|
|
|
|
.patientProgressNoteList[
|
|
|
|
|
|
|
|
index]
|
|
|
|
|
|
|
|
.createdBy,
|
|
|
|
|
|
|
|
notes: model
|
|
|
|
|
|
|
|
.patientProgressNoteList[
|
|
|
|
|
|
|
|
index]
|
|
|
|
|
|
|
|
.notes,
|
|
|
|
|
|
|
|
verifiedNote: false,
|
|
|
|
verifiedNote: false,
|
|
|
|
patientTypeID:
|
|
|
|
patientTypeID: patient.patientType,
|
|
|
|
patient
|
|
|
|
|
|
|
|
.patientType,
|
|
|
|
|
|
|
|
patientOutSA: false,
|
|
|
|
patientOutSA: false,
|
|
|
|
);
|
|
|
|
);
|
|
|
|
await model
|
|
|
|
await model.updatePatientProgressNote(reqModel);
|
|
|
|
.updatePatientProgressNote(
|
|
|
|
await getProgressNoteList(context, model,
|
|
|
|
reqModel);
|
|
|
|
isLocalBusy: true);
|
|
|
|
await getProgressNoteList(
|
|
|
|
GifLoaderDialogUtils.hideDialog(context);
|
|
|
|
context, model,
|
|
|
|
|
|
|
|
isLocalBusy:
|
|
|
|
|
|
|
|
true);
|
|
|
|
|
|
|
|
GifLoaderDialogUtils
|
|
|
|
|
|
|
|
.hideDialog(
|
|
|
|
|
|
|
|
context);
|
|
|
|
|
|
|
|
});
|
|
|
|
});
|
|
|
|
},
|
|
|
|
},
|
|
|
|
child: Container(
|
|
|
|
child: Container(
|
|
|
|
decoration: BoxDecoration(
|
|
|
|
decoration: BoxDecoration(
|
|
|
|
color: Colors.red[600],
|
|
|
|
color: Colors.red[600],
|
|
|
|
borderRadius:
|
|
|
|
borderRadius: BorderRadius.circular(10),
|
|
|
|
BorderRadius.circular(
|
|
|
|
|
|
|
|
10),
|
|
|
|
|
|
|
|
),
|
|
|
|
),
|
|
|
|
// color:Colors.red[600],
|
|
|
|
// color:Colors.red[600],
|
|
|
|
|
|
|
|
|
|
|
|
child: Row(
|
|
|
|
child: Row(
|
|
|
|
children: [
|
|
|
|
children: [
|
|
|
|
Icon(
|
|
|
|
Icon(
|
|
|
|
FontAwesomeIcons
|
|
|
|
FontAwesomeIcons.trash,
|
|
|
|
.trash,
|
|
|
|
|
|
|
|
size: 12,
|
|
|
|
size: 12,
|
|
|
|
color: Colors.white,
|
|
|
|
color: Colors.white,
|
|
|
|
),
|
|
|
|
),
|
|
|
|
@ -442,43 +379,27 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
|
|
|
|
height: 10,
|
|
|
|
height: 10,
|
|
|
|
),
|
|
|
|
),
|
|
|
|
Row(
|
|
|
|
Row(
|
|
|
|
mainAxisAlignment:
|
|
|
|
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
|
|
|
MainAxisAlignment.spaceBetween,
|
|
|
|
crossAxisAlignment: CrossAxisAlignment.start,
|
|
|
|
crossAxisAlignment:
|
|
|
|
|
|
|
|
CrossAxisAlignment.start,
|
|
|
|
|
|
|
|
children: [
|
|
|
|
children: [
|
|
|
|
Container(
|
|
|
|
Container(
|
|
|
|
width: MediaQuery.of(context)
|
|
|
|
width: MediaQuery.of(context).size.width * 0.60,
|
|
|
|
.size
|
|
|
|
|
|
|
|
.width *
|
|
|
|
|
|
|
|
0.60,
|
|
|
|
|
|
|
|
child: Column(
|
|
|
|
child: Column(
|
|
|
|
crossAxisAlignment:
|
|
|
|
crossAxisAlignment: CrossAxisAlignment.start,
|
|
|
|
CrossAxisAlignment.start,
|
|
|
|
|
|
|
|
children: [
|
|
|
|
children: [
|
|
|
|
Row(
|
|
|
|
Row(
|
|
|
|
crossAxisAlignment:
|
|
|
|
crossAxisAlignment: CrossAxisAlignment.start,
|
|
|
|
CrossAxisAlignment
|
|
|
|
|
|
|
|
.start,
|
|
|
|
|
|
|
|
children: [
|
|
|
|
children: [
|
|
|
|
AppText(
|
|
|
|
AppText(
|
|
|
|
TranslationBase.of(
|
|
|
|
TranslationBase.of(context).createdBy,
|
|
|
|
context)
|
|
|
|
|
|
|
|
.createdBy,
|
|
|
|
|
|
|
|
fontSize: 10,
|
|
|
|
fontSize: 10,
|
|
|
|
),
|
|
|
|
),
|
|
|
|
Expanded(
|
|
|
|
Expanded(
|
|
|
|
child: AppText(
|
|
|
|
child: AppText(
|
|
|
|
model
|
|
|
|
model.patientProgressNoteList[index].doctorName ?? '',
|
|
|
|
.patientProgressNoteList[
|
|
|
|
fontWeight: FontWeight.w600,
|
|
|
|
index]
|
|
|
|
|
|
|
|
.doctorName ??
|
|
|
|
|
|
|
|
'',
|
|
|
|
|
|
|
|
fontWeight:
|
|
|
|
|
|
|
|
FontWeight.w600,
|
|
|
|
|
|
|
|
fontSize: 12,
|
|
|
|
fontSize: 12,
|
|
|
|
isCopyable:true,
|
|
|
|
isCopyable:true,),
|
|
|
|
),
|
|
|
|
|
|
|
|
),
|
|
|
|
),
|
|
|
|
],
|
|
|
|
],
|
|
|
|
),
|
|
|
|
),
|
|
|
|
@ -488,70 +409,38 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
|
|
|
|
Column(
|
|
|
|
Column(
|
|
|
|
children: [
|
|
|
|
children: [
|
|
|
|
AppText(
|
|
|
|
AppText(
|
|
|
|
model
|
|
|
|
model.patientProgressNoteList[index].createdOn != null
|
|
|
|
.patientProgressNoteList[
|
|
|
|
|
|
|
|
index]
|
|
|
|
|
|
|
|
.createdOn !=
|
|
|
|
|
|
|
|
null
|
|
|
|
|
|
|
|
? AppDateUtils.getDayMonthYearDateFormatted(
|
|
|
|
? AppDateUtils.getDayMonthYearDateFormatted(
|
|
|
|
AppDateUtils
|
|
|
|
AppDateUtils.getDateTimeFromServerFormat(
|
|
|
|
.getDateTimeFromServerFormat(model
|
|
|
|
model.patientProgressNoteList[index].createdOn ?? ""),
|
|
|
|
.patientProgressNoteList[
|
|
|
|
isArabic: projectViewModel.isArabic,
|
|
|
|
index]
|
|
|
|
isMonthShort: true): AppDateUtils.getDayMonthYearDateFormatted(DateTime.now(),
|
|
|
|
.createdOn),
|
|
|
|
isArabic: projectViewModel.isArabic),
|
|
|
|
isArabic:
|
|
|
|
|
|
|
|
projectViewModel
|
|
|
|
|
|
|
|
.isArabic,
|
|
|
|
|
|
|
|
isMonthShort: true)
|
|
|
|
|
|
|
|
: AppDateUtils
|
|
|
|
|
|
|
|
.getDayMonthYearDateFormatted(
|
|
|
|
|
|
|
|
DateTime.now(),
|
|
|
|
|
|
|
|
isArabic:
|
|
|
|
|
|
|
|
projectViewModel
|
|
|
|
|
|
|
|
.isArabic),
|
|
|
|
|
|
|
|
fontWeight: FontWeight.w600,
|
|
|
|
fontWeight: FontWeight.w600,
|
|
|
|
fontSize: 14,
|
|
|
|
fontSize: 14,
|
|
|
|
isCopyable:true,
|
|
|
|
isCopyable:true,),
|
|
|
|
),
|
|
|
|
|
|
|
|
AppText(
|
|
|
|
AppText(
|
|
|
|
model
|
|
|
|
model.patientProgressNoteList[index].createdOn != null
|
|
|
|
.patientProgressNoteList[
|
|
|
|
|
|
|
|
index]
|
|
|
|
|
|
|
|
.createdOn !=
|
|
|
|
|
|
|
|
null
|
|
|
|
|
|
|
|
? AppDateUtils.getHour(
|
|
|
|
? AppDateUtils.getHour(
|
|
|
|
AppDateUtils
|
|
|
|
AppDateUtils.getDateTimeFromServerFormat(
|
|
|
|
.getDateTimeFromServerFormat(model
|
|
|
|
model.patientProgressNoteList[index].createdOn ?? ""))
|
|
|
|
.patientProgressNoteList[
|
|
|
|
: AppDateUtils.getHour(DateTime.now()),
|
|
|
|
index]
|
|
|
|
|
|
|
|
.createdOn))
|
|
|
|
|
|
|
|
: AppDateUtils.getHour(
|
|
|
|
|
|
|
|
DateTime.now()),
|
|
|
|
|
|
|
|
fontWeight: FontWeight.w600,
|
|
|
|
fontWeight: FontWeight.w600,
|
|
|
|
fontSize: 14,
|
|
|
|
fontSize: 14,isCopyable:true,
|
|
|
|
isCopyable:true,
|
|
|
|
|
|
|
|
),
|
|
|
|
),
|
|
|
|
],
|
|
|
|
],
|
|
|
|
crossAxisAlignment:
|
|
|
|
crossAxisAlignment: CrossAxisAlignment.end,
|
|
|
|
CrossAxisAlignment.end,
|
|
|
|
|
|
|
|
)
|
|
|
|
)
|
|
|
|
],
|
|
|
|
],
|
|
|
|
),
|
|
|
|
),
|
|
|
|
SizedBox(
|
|
|
|
SizedBox(
|
|
|
|
height: 8,
|
|
|
|
height: 8,
|
|
|
|
),
|
|
|
|
),
|
|
|
|
Row(
|
|
|
|
Row(mainAxisAlignment: MainAxisAlignment.start, children: [
|
|
|
|
mainAxisAlignment:
|
|
|
|
|
|
|
|
MainAxisAlignment.start,
|
|
|
|
|
|
|
|
children: [
|
|
|
|
|
|
|
|
Expanded(
|
|
|
|
Expanded(
|
|
|
|
child: AppText(
|
|
|
|
child: AppText(
|
|
|
|
model
|
|
|
|
model.patientProgressNoteList[index].notes,
|
|
|
|
.patientProgressNoteList[
|
|
|
|
fontSize: 10,isCopyable:true,
|
|
|
|
index]
|
|
|
|
|
|
|
|
.notes,
|
|
|
|
|
|
|
|
fontSize: 10,
|
|
|
|
|
|
|
|
isCopyable:true,
|
|
|
|
|
|
|
|
),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
])
|
|
|
|
])
|
|
|
|
@ -574,7 +463,7 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
|
|
|
|
);
|
|
|
|
);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
showMyDialog({BuildContext context, Function confirmFun, String actionName}) {
|
|
|
|
showMyDialog({required BuildContext context, required Function confirmFun, required String actionName}) {
|
|
|
|
showDialog(
|
|
|
|
showDialog(
|
|
|
|
context: context,
|
|
|
|
context: context,
|
|
|
|
builder: (ctx) => Center(
|
|
|
|
builder: (ctx) => Center(
|
|
|
|
|