updates & fixes

development-3.3_voipCall
haroon amjad 2 years ago
parent 793f9ff905
commit f0204fcbb0

@ -22,7 +22,7 @@ class VitalSignData {
int patientType; int patientType;
int pulseBeatPerMinute; int pulseBeatPerMinute;
int pulseRhythm; int pulseRhythm;
int respirationBeatPerMinute; num respirationBeatPerMinute;
int respirationPattern; int respirationPattern;
int sao2; int sao2;
int status; int status;

@ -14,8 +14,7 @@ class SickLeaveViewModel extends BaseViewModel {
SickLeaveService _sickLeaveService = locator<SickLeaveService>(); SickLeaveService _sickLeaveService = locator<SickLeaveService>();
PatientService _patientService = locator<PatientService>(); PatientService _patientService = locator<PatientService>();
SickLeaveStatisticsModel get sickLeaveStatistics => SickLeaveStatisticsModel get sickLeaveStatistics => _sickLeaveService.sickLeavestatisitics;
_sickLeaveService.sickLeavestatisitics;
get getAllSIckLeave => _sickLeaveService.getAllSickLeave; get getAllSIckLeave => _sickLeaveService.getAllSickLeave;
@ -31,10 +30,7 @@ class SickLeaveViewModel extends BaseViewModel {
get postSechedule => _sickLeaveService.postReschedule; get postSechedule => _sickLeaveService.postReschedule;
get getAllSIckLeavePatient => removeDuplicates([ get getAllSIckLeavePatient => removeDuplicates([..._sickLeaveService.getAllSickLeaveDoctor, ..._sickLeaveService.getAllSickLeavePatient]);
..._sickLeaveService.getAllSickLeavePatient,
..._sickLeaveService.getAllSickLeaveDoctor
]);
Future addSickLeave(AddSickLeaveRequest addSickLeaveRequest) async { Future addSickLeave(AddSickLeaveRequest addSickLeaveRequest) async {
setState(ViewState.BusyLocal); setState(ViewState.BusyLocal);
@ -89,17 +85,13 @@ class SickLeaveViewModel extends BaseViewModel {
setState(ViewState.Idle); setState(ViewState.Idle);
} }
Future getSickLeaveForPatient(PatiantInformtion patient, Future getSickLeaveForPatient(PatiantInformtion patient, {bool isLocalBusy = false}) async {
{bool isLocalBusy = false}) async {
if (isLocalBusy) if (isLocalBusy)
setState(ViewState.BusyLocal); setState(ViewState.BusyLocal);
else else
setState(ViewState.Busy); setState(ViewState.Busy);
var patientMRN = patient.patientMRN ?? patient.patientId; var patientMRN = patient.patientMRN ?? patient.patientId;
var services = [ var services = [_sickLeaveService.getSickLeavePatient(patientMRN), _sickLeaveService.getSickLeaveDoctor(patientMRN)];
_sickLeaveService.getSickLeavePatient(patientMRN),
_sickLeaveService.getSickLeaveDoctor(patientMRN)
];
final results = await Future.wait(services); final results = await Future.wait(services);
if (_sickLeaveService.hasError) { if (_sickLeaveService.hasError) {
@ -184,15 +176,13 @@ class SickLeaveViewModel extends BaseViewModel {
} else } else
setState(ViewState.Idle); setState(ViewState.Idle);
} }
List<SickLeavePatientModel> removeDuplicates(List<SickLeavePatientModel> items) { List<SickLeavePatientModel> removeDuplicates(List<SickLeavePatientModel> items) {
List<SickLeavePatientModel>uniqueItems = []; List<SickLeavePatientModel> uniqueItems = [];
var uniqueIDs = items var uniqueIDs = items.map((e) => e.appointmentNo).toSet();
.map((e) => e.appointmentNo)
.toSet();
uniqueIDs.forEach((e) { uniqueIDs.forEach((e) {
uniqueItems.add(items.firstWhere((i) => i.appointmentNo == e)); uniqueItems.add(items.firstWhere((i) => i.appointmentNo == e));
}); });
return uniqueItems; return uniqueItems;
} }
} }

@ -29,255 +29,185 @@ class PatientSickLeaveScreen extends StatelessWidget {
Widget build(BuildContext context) { Widget build(BuildContext context) {
ProjectViewModel projectsProvider = Provider.of<ProjectViewModel>(context); ProjectViewModel projectsProvider = Provider.of<ProjectViewModel>(context);
final routeArgs = ModalRoute final routeArgs = ModalRoute.of(context).settings.arguments as Map;
.of(context)
.settings
.arguments as Map;
patient = routeArgs['patient']; patient = routeArgs['patient'];
bool isInpatient = routeArgs['isInpatient']; bool isInpatient = routeArgs['isInpatient'];
return BaseView<SickLeaveViewModel>( return BaseView<SickLeaveViewModel>(
onModelReady: (model) async { onModelReady: (model) async {
await model.getSickLeaveForPatient(patient); await model.getSickLeaveForPatient(patient);
}, },
builder: (_, model, w) => builder: (_, model, w) => AppScaffold(
AppScaffold( baseViewModel: model,
baseViewModel: model, isShowAppBar: true,
isShowAppBar: true, backgroundColor: Colors.grey[100],
backgroundColor: Colors.grey[100], appBar: PatientProfileAppBar(
appBar: PatientProfileAppBar( patient,
patient, isInpatient: isInpatient,
isInpatient: isInpatient, ),
), body: Column(children: [
body: Column(children: [ patient.patientStatusType == 43
patient.patientStatusType == 43 ? Column(
? Column( crossAxisAlignment: CrossAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start, children: [
children: [ Padding(
Padding( padding: EdgeInsets.all(10),
padding: EdgeInsets.all(10), child: Column(
child: Column( crossAxisAlignment: CrossAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start, children: [
children: [ SizedBox(
SizedBox( height: SizeConfig.isHeightVeryShort
height: SizeConfig.isHeightVeryShort ? 30
? 30 : SizeConfig.isHeightShort
: SizeConfig.isHeightShort ? 35
? 35 : 10,
: 10, ),
), if (!projectsProvider.isArabic)
if (!projectsProvider.isArabic) AppText(
TranslationBase.of(context).patient,
fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * (SizeConfig.isWidthLarge ? 3 : 4),
fontWeight: FontWeight.w700,
letterSpacing: -0.72,
color: Color(0xFF2E303A),
),
AppText( AppText(
TranslationBase TranslationBase.of(context).sickLeave,
.of(context) fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * (SizeConfig.isWidthLarge ? 6 : 6),
.patient, fontWeight: FontWeight.bold,
fontSize: SizeConfig letterSpacing: -1.44,
.getTextMultiplierBasedOnWidth() * (SizeConfig
.isWidthLarge ? 3 : 4),
fontWeight: FontWeight.w700,
letterSpacing: -0.72,
color: Color(0xFF2E303A), color: Color(0xFF2E303A),
), ),
AppText( ],
TranslationBase ),
.of(context)
.sickLeave,
fontSize: SizeConfig.getTextMultiplierBasedOnWidth() *
(SizeConfig.isWidthLarge ? 6 : 6),
fontWeight: FontWeight.bold,
letterSpacing: -1.44,
color: Color(0xFF2E303A),
),
],
), ),
), AddNewOrder(
AddNewOrder( label: TranslationBase.of(context).noSickLeaveApplied,
label: TranslationBase onTap: () async {
.of(context) await locator<AnalyticsService>().logEvent(
.noSickLeaveApplied, eventCategory: "Add Sick Leave Screen"
onTap: () async { "Leave Screen",
await locator<AnalyticsService>().logEvent( eventAction: "apply For Sick Leave",
eventCategory: "Add Sick Leave Screen" );
"Leave Screen", openSickLeave(context, model);
eventAction: "apply For Sick Leave", }),
); ],
openSickLeave(context, model); )
}), : SizedBox(),
], model.getAllSIckLeavePatient.length > 0
) ? Expanded(
: SizedBox(), child: FractionallySizedBox(
model.getAllSIckLeavePatient.length > 0 widthFactor: 0.95,
? Expanded( child: ListView.builder(
child: FractionallySizedBox( scrollDirection: Axis.vertical,
widthFactor: 0.95, shrinkWrap: true,
child: ListView.builder( itemCount: model.getAllSIckLeavePatient.length,
scrollDirection: Axis.vertical, itemBuilder: (BuildContext ctxt, int index) {
shrinkWrap: true, SickLeavePatientModel item = model.getAllSIckLeavePatient[index];
itemCount: model.getAllSIckLeavePatient.length, return Column(
itemBuilder: (BuildContext ctxt, int index) { children: [
SickLeavePatientModel item = model CardWithBgWidget(
.getAllSIckLeavePatient[index]; padding: 0,
return Column( marginLeft: 10,
children: [ marginSymmetric: 10,
CardWithBgWidget( hasBorder: false,
padding: 0, bgColor: Colors.black,
marginLeft: 10, widget: Container(
marginSymmetric: 10, color: Colors.white,
hasBorder: false, padding: EdgeInsets.all(20),
bgColor: Colors.black, child: InkWell(
widget: Container( child: Column(
color: Colors.white, children: [
padding: EdgeInsets.all(20), if (item.doctorName != null)
child: InkWell( Row(crossAxisAlignment: CrossAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start, children: [
child: Column( Expanded(
children: [ // width: MediaQuery.of(context).size.width*0.51,
if (item.doctorName != null) child: AppText(
Row(crossAxisAlignment: CrossAxisAlignment Utils.capitalize(item.doctorName ?? ""),
.start, fontSize: 18,
mainAxisAlignment: MainAxisAlignment color: Color(0xff2e303a),
.start, fontWeight: FontWeight.w700,
children: [ fontFamily: 'Poppins',
Expanded( textOverflow: TextOverflow.ellipsis,
// width: MediaQuery.of(context).size.width*0.51,
child: AppText(
Utils.capitalize(
item.doctorName ?? ""),
fontSize: 18,
color: Color(0xff2e303a),
fontWeight: FontWeight.w700,
fontFamily: 'Poppins',
textOverflow: TextOverflow
.ellipsis,
),
), ),
]),
SizedBox(
height: 10,
),
Row(
children: [
ClipRRect(
borderRadius: BorderRadius.circular(
50.0),
child: CachedNetworkImage(
imageUrl: item.doctorImageURL ??
"https://hmgwebservices.com/Images/MobileImages/DUBAI/unkown.png",
height: 30,
width: 30,
errorWidget: (context, url,
error) =>
AppText(
'No Image',
fontSize: 10,
),
), ),
), ]),
SizedBox( SizedBox(
width: 10, height: 10,
), ),
Expanded( Row(
child: Column( children: [
children: [ ClipRRect(
CustomRow( borderRadius: BorderRadius.circular(50.0),
label: TranslationBase child: CachedNetworkImage(
.of(context) imageUrl: item.doctorImageURL ?? "https://hmgwebservices.com/Images/MobileImages/DUBAI/unkown.png",
.daysSickleave, height: 30,
labelSize: SizeConfig width: 30,
.getTextMultiplierBasedOnWidth() * errorWidget: (context, url, error) => AppText(
3.3, 'No Image',
valueSize: SizeConfig fontSize: 10,
.getTextMultiplierBasedOnWidth() *
4,
value:
(item.sickLeaveDays
.toString() != null &&
item.sickLeaveDays
.toString() != "null")
? item.sickLeaveDays
.toString()
: item.noOfDays
.toString(),
), ),
CustomRow( ),
label: TranslationBase ),
.of(context) SizedBox(
.startDate + ' ' ?? "", width: 10,
labelSize: SizeConfig ),
.getTextMultiplierBasedOnWidth() * Expanded(
3.3, child: Column(
valueSize: SizeConfig children: [
.getTextMultiplierBasedOnWidth() * CustomRow(
4, label: TranslationBase.of(context).daysSickleave,
value: AppDateUtils labelSize: SizeConfig.getTextMultiplierBasedOnWidth() * 3.3,
.getDayMonthYearDateFormatted( valueSize: SizeConfig.getTextMultiplierBasedOnWidth() * 4,
item.startDate.contains( value:
"/Date(") (item.sickLeaveDays.toString() != null && item.sickLeaveDays.toString() != "null") ? item.sickLeaveDays.toString() : item.noOfDays.toString(),
? AppDateUtils
.convertStringToDate(
item.startDate)
: DateTime.parse(
item.startDate),
), ),
), CustomRow(
CustomRow( label: TranslationBase.of(context).startDate + ' ' ?? "",
label: TranslationBase labelSize: SizeConfig.getTextMultiplierBasedOnWidth() * 3.3,
.of(context) valueSize: SizeConfig.getTextMultiplierBasedOnWidth() * 4,
.endDate + ' ' ?? "", value: AppDateUtils.getDayMonthYearDateFormatted(
labelSize: SizeConfig item.startDate.contains("/Date(") ? AppDateUtils.convertStringToDate(item.startDate) : DateTime.parse(item.startDate),
.getTextMultiplierBasedOnWidth() *
3.3,
valueSize: SizeConfig
.getTextMultiplierBasedOnWidth() *
4,
value: AppDateUtils
.getDayMonthYearDateFormatted(
item.startDate.contains(
"/Date(")
? AppDateUtils
.convertStringToDate(
item.endDate ?? "").add(
Duration(
days: item.noOfDays ??
item
.sickLeaveDays),
)
: DateTime.parse(
item.startDate ?? "")
.add(
Duration(
days: item.noOfDays ??
""),
), ),
), ),
), CustomRow(
], label: TranslationBase.of(context).endDate + ' ' ?? "",
crossAxisAlignment: CrossAxisAlignment labelSize: SizeConfig.getTextMultiplierBasedOnWidth() * 3.3,
.start, valueSize: SizeConfig.getTextMultiplierBasedOnWidth() * 4,
value: AppDateUtils.getDayMonthYearDateFormatted(
item.startDate.contains("/Date(")
? AppDateUtils.convertStringToDate(item.endDate ?? "").add(
Duration(days: item.noOfDays ?? item.sickLeaveDays),
)
: DateTime.parse(item.startDate ?? "").add(
Duration(days: item.noOfDays ?? ""),
),
),
),
],
crossAxisAlignment: CrossAxisAlignment.start,
),
), ),
), ],
], ),
), ],
], ),
), ),
), ),
), ),
), ],
], );
); }),
}), ),
), )
) : patient.patientStatusType != 43
: patient.patientStatusType != 43
? ErrorMessage( ? ErrorMessage(
error: TranslationBase error: TranslationBase.of(context).noSickLeave,
.of(context) )
.noSickLeave,
)
: SizedBox(), : SizedBox(),
SizedBox( SizedBox(
height: 100, height: 100,
) )
]), ]),
), ),
); );
} }
@ -296,4 +226,3 @@ class PatientSickLeaveScreen extends StatelessWidget {
); );
} }
} }

@ -148,12 +148,14 @@ class _AddAssessmentDetailsState extends State<AddAssessmentDetails> {
controller: icdNameController, controller: icdNameController,
itemSubmitted: (item) => setState(() { itemSubmitted: (item) => setState(() {
widget.mySelectedAssessment.selectedICD = item; widget.mySelectedAssessment.selectedICD = item;
icdNameController.text = '${item.code.trim()}/${item.description}'; // icdNameController.text = '${item.code.trim()}/${item.description}';
icdNameController.text = '${item.description}';
}), }),
key: key, key: key,
suggestions: model.listOfICD10, suggestions: model.listOfICD10,
suggestionsAmount: 10,
itemBuilder: (context, suggestion) => itemBuilder: (context, suggestion) =>
new Padding(child: AppText(suggestion.description + " / " + suggestion.code.toString()), padding: EdgeInsets.all(8.0)), new Padding(child: AppText(suggestion.description + " / " + suggestion.code.toString(), fontSize: 12.0), padding: EdgeInsets.all(8.0)),
itemSorter: (a, b) => 1, itemSorter: (a, b) => 1,
itemFilter: (suggestion, input) => itemFilter: (suggestion, input) =>
// suggestion.description.toLowerCase().startsWith(input.toLowerCase()) || // suggestion.description.toLowerCase().startsWith(input.toLowerCase()) ||

@ -30,19 +30,13 @@ class UpdateAssessmentPage extends StatefulWidget {
final Function changeLoadingState; final Function changeLoadingState;
final int currentIndex; final int currentIndex;
UpdateAssessmentPage( UpdateAssessmentPage({Key key, this.changePageViewIndex, this.patientInfo, this.changeLoadingState, this.currentIndex});
{Key key,
this.changePageViewIndex,
this.patientInfo,
this.changeLoadingState,
this.currentIndex});
@override @override
_UpdateAssessmentPageState createState() => _UpdateAssessmentPageState(); _UpdateAssessmentPageState createState() => _UpdateAssessmentPageState();
} }
class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> implements AssessmentCallBack {
implements AssessmentCallBack {
bool isAssessmentExpand = false; bool isAssessmentExpand = false;
List<MySelectedAssessment> mySelectedAssessmentList = List(); List<MySelectedAssessment> mySelectedAssessmentList = List();
@ -71,21 +65,18 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage>
masterKeys: MasterKeysService.DiagnosisCondition, masterKeys: MasterKeysService.DiagnosisCondition,
id: element.conditionID, id: element.conditionID,
); );
if (diagnosisCondition != null && if (diagnosisCondition != null && diagnosisType != null && diagnosisCondition != null) {
diagnosisType != null && MySelectedAssessment temMySelectedAssessment = SoapUtils.generateMySelectedAssessment(
diagnosisCondition != null) { appointmentNo: element.appointmentNo,
MySelectedAssessment temMySelectedAssessment = remark: element.remarks,
SoapUtils.generateMySelectedAssessment( diagnosisType: diagnosisType,
appointmentNo: element.appointmentNo, diagnosisCondition: diagnosisCondition,
remark: element.remarks, selectedICD: selectedICD,
diagnosisType: diagnosisType, doctorID: element.doctorID,
diagnosisCondition: diagnosisCondition, doctorName: element.doctorName,
selectedICD: selectedICD, createdBy: element.createdBy,
doctorID: element.doctorID, createdOn: element.createdOn,
doctorName: element.doctorName, icdCode10ID: element.icdCode10ID);
createdBy: element.createdBy,
createdOn: element.createdOn,
icdCode10ID: element.icdCode10ID);
mySelectedAssessmentList.add(temMySelectedAssessment); mySelectedAssessmentList.add(temMySelectedAssessment);
} }
@ -126,111 +117,73 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage>
Column( Column(
children: [ children: [
SOAPOpenItems( SOAPOpenItems(
label: label: "${TranslationBase.of(context).addAssessment}",
"${TranslationBase.of(context).addAssessment}",
onTap: () { onTap: () {
openAssessmentDialog(context, openAssessmentDialog(context, isUpdate: false, model: model);
isUpdate: false, model: model);
}, },
), ),
SizedBox( SizedBox(
height: 20, height: 20,
), ),
Column( Column(
children: children: mySelectedAssessmentList.map((assessment) {
mySelectedAssessmentList.map((assessment) {
return Container( return Container(
margin: EdgeInsets.only( margin: EdgeInsets.only(left: 5, right: 5, top: 15, bottom: 15),
left: 5, right: 5, top: 15, bottom: 15),
child: Column( child: Column(
children: [ children: [
Row( Row(
children: [ children: [
RichText( RichText(
text: new TextSpan( text: new TextSpan(
style: new TextStyle( style: new TextStyle(
fontSize: SizeConfig fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 3.6,
.getTextMultiplierBasedOnWidth() * color: Color(0xFF2E303A),
3.6, fontFamily: 'Poppins',
color: Color(0xFF2E303A), fontWeight: FontWeight.w600,
fontFamily: 'Poppins', letterSpacing: -0.4),
children: <TextSpan>[
new TextSpan(
text: "ICD : ".toUpperCase(),
),
new TextSpan(text: (assessment != null && assessment.selectedICD != null) ? assessment.selectedICD.code.trim().toUpperCase() ?? "" : ""),
],
),
),
Column(
crossAxisAlignment: CrossAxisAlignment.end,
children: [
AppText(
assessment.createdOn != null
? AppDateUtils.getDayMonthYearDateFormatted(DateTime.parse(assessment.createdOn), isMonthShort: true)
: AppDateUtils.getDayMonthYearDateFormatted(DateTime.now()),
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
letterSpacing: -0.4), fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 3.6,
children: <TextSpan>[ ),
new TextSpan( AppText(
text: "ICD : ".toUpperCase(), assessment.createdOn != null ? AppDateUtils.getHour(DateTime.parse(assessment.createdOn)) : AppDateUtils.getHour(DateTime.now()),
fontWeight: FontWeight.w600,
color: Color(0xFF575757),
fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 3.6,
), ),
new TextSpan(
text: assessment
.selectedICD.code
.trim()
.toUpperCase() ??
""),
], ],
), ),
), ],
Column(
crossAxisAlignment:
CrossAxisAlignment.end,
children: [
AppText(
assessment.createdOn != null
? AppDateUtils
.getDayMonthYearDateFormatted(
DateTime.parse(
assessment
.createdOn), isMonthShort: true)
: AppDateUtils
.getDayMonthYearDateFormatted(
DateTime.now()),
fontWeight: FontWeight.w600,
fontSize: SizeConfig
.getTextMultiplierBasedOnWidth() *
3.6,
),
AppText(
assessment.createdOn != null
? AppDateUtils.getHour(
DateTime.parse(
assessment
.createdOn))
: AppDateUtils.getHour(
DateTime.now()),
fontWeight: FontWeight.w600,
color: Color(0xFF575757),
fontSize: SizeConfig
.getTextMultiplierBasedOnWidth() *
3.6,
),
],
),
],
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
), ),
Row( Row(
mainAxisAlignment: mainAxisAlignment: MainAxisAlignment.spaceBetween,
MainAxisAlignment.spaceBetween, crossAxisAlignment: CrossAxisAlignment.start,
crossAxisAlignment:
CrossAxisAlignment.start,
children: [ children: [
Column( Column(
crossAxisAlignment: crossAxisAlignment: CrossAxisAlignment.start,
CrossAxisAlignment.start,
children: [ children: [
Container( Container(
width: MediaQuery.of(context) width: MediaQuery.of(context).size.width * 0.50,
.size
.width *
0.50,
child: RichText( child: RichText(
text: new TextSpan( text: new TextSpan(
style: new TextStyle( style: new TextStyle(
fontSize: SizeConfig fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 4.3,
.getTextMultiplierBasedOnWidth() *
4.3,
color: Color(0xFF2E303A), color: Color(0xFF2E303A),
fontFamily: 'Poppins', fontFamily: 'Poppins',
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
@ -238,9 +191,8 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage>
), ),
children: <TextSpan>[ children: <TextSpan>[
new TextSpan( new TextSpan(
text: assessment text: (assessment != null && assessment.selectedICD != null) ? assessment.selectedICD.description.toString() : "",
.selectedICD.description // text: assessment.selectedICD.description.toString(),
.toString(),
), ),
], ],
), ),
@ -249,34 +201,24 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage>
RichText( RichText(
text: new TextSpan( text: new TextSpan(
style: new TextStyle( style: new TextStyle(
fontSize: SizeConfig fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 3.5,
.getTextMultiplierBasedOnWidth() *
3.5,
color: Color(0xFF2E303A), color: Color(0xFF2E303A),
fontFamily: 'Poppins', fontFamily: 'Poppins',
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
), ),
children: <TextSpan>[ children: <TextSpan>[
new TextSpan( new TextSpan(
text: TranslationBase.of( text: TranslationBase.of(context).appointmentNo,
context)
.appointmentNo,
style: new TextStyle( style: new TextStyle(
fontSize: SizeConfig fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 3,
.getTextMultiplierBasedOnWidth() *
3,
letterSpacing: -0.4, letterSpacing: -0.4,
color: Color(0xFF575757), color: Color(0xFF575757),
), ),
), ),
new TextSpan( new TextSpan(
text: assessment.appointmentId text: assessment.appointmentId.toString() ?? "",
.toString() ??
"",
style: new TextStyle( style: new TextStyle(
fontSize: SizeConfig fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 3.6,
.getTextMultiplierBasedOnWidth() *
3.6,
letterSpacing: -0.48, letterSpacing: -0.48,
color: Color(0xFF2B353E), color: Color(0xFF2B353E),
), ),
@ -287,36 +229,19 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage>
RichText( RichText(
text: new TextSpan( text: new TextSpan(
style: new TextStyle( style: new TextStyle(
fontSize: SizeConfig fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 3, color: Color(0xFF2E303A), fontFamily: 'Poppins', fontWeight: FontWeight.w600),
.getTextMultiplierBasedOnWidth() *
3,
color: Color(0xFF2E303A),
fontFamily: 'Poppins',
fontWeight: FontWeight.w600),
children: <TextSpan>[ children: <TextSpan>[
new TextSpan( new TextSpan(
text: TranslationBase.of( text: TranslationBase.of(context).condition + " : ",
context)
.condition +
" : ",
style: new TextStyle( style: new TextStyle(
letterSpacing: -0.4, letterSpacing: -0.4,
color: Color(0xFF575757), color: Color(0xFF575757),
), ),
), ),
new TextSpan( new TextSpan(
text: projectViewModel text: projectViewModel.isArabic ? assessment.selectedDiagnosisCondition.nameAr : assessment.selectedDiagnosisCondition.nameEn,
.isArabic
? assessment
.selectedDiagnosisCondition
.nameAr
: assessment
.selectedDiagnosisCondition
.nameEn,
style: new TextStyle( style: new TextStyle(
fontSize: SizeConfig fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 3.6,
.getTextMultiplierBasedOnWidth() *
3.6,
letterSpacing: -0.48, letterSpacing: -0.48,
color: Color(0xFF2B353E), color: Color(0xFF2B353E),
), ),
@ -327,36 +252,19 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage>
RichText( RichText(
text: new TextSpan( text: new TextSpan(
style: new TextStyle( style: new TextStyle(
fontSize: SizeConfig fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 3, color: Color(0xFF2E303A), fontFamily: 'Poppins', fontWeight: FontWeight.w600),
.getTextMultiplierBasedOnWidth() *
3,
color: Color(0xFF2E303A),
fontFamily: 'Poppins',
fontWeight: FontWeight.w600),
children: <TextSpan>[ children: <TextSpan>[
new TextSpan( new TextSpan(
text: TranslationBase.of( text: TranslationBase.of(context).dType + ' : ',
context)
.dType +
' : ',
style: new TextStyle( style: new TextStyle(
letterSpacing: -0.4, letterSpacing: -0.4,
color: Color(0xFF575757), color: Color(0xFF575757),
), ),
), ),
new TextSpan( new TextSpan(
text: projectViewModel text: projectViewModel.isArabic ? assessment.selectedDiagnosisType.nameAr : assessment.selectedDiagnosisType.nameEn,
.isArabic
? assessment
.selectedDiagnosisType
.nameAr
: assessment
.selectedDiagnosisType
.nameEn,
style: new TextStyle( style: new TextStyle(
fontSize: SizeConfig fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 3.6,
.getTextMultiplierBasedOnWidth() *
3.6,
letterSpacing: -0.48, letterSpacing: -0.48,
color: Color(0xFF2B353E), color: Color(0xFF2B353E),
), ),
@ -368,35 +276,20 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage>
RichText( RichText(
text: new TextSpan( text: new TextSpan(
style: new TextStyle( style: new TextStyle(
fontSize: SizeConfig fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 3.6, color: Color(0xFF2E303A), fontFamily: 'Poppins', fontWeight: FontWeight.w600),
.getTextMultiplierBasedOnWidth() *
3.6,
color: Color(0xFF2E303A),
fontFamily: 'Poppins',
fontWeight:
FontWeight.w600),
children: <TextSpan>[ children: <TextSpan>[
new TextSpan( new TextSpan(
text: TranslationBase.of( text: TranslationBase.of(context).doctor + ' : ',
context)
.doctor +
' : ',
style: new TextStyle( style: new TextStyle(
fontSize: SizeConfig fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 3,
.getTextMultiplierBasedOnWidth() *
3,
letterSpacing: -0.4, letterSpacing: -0.4,
color: Color(0xFF575757), color: Color(0xFF575757),
), ),
), ),
new TextSpan( new TextSpan(
text: text: assessment.doctorName ?? '',
assessment.doctorName ??
'',
style: new TextStyle( style: new TextStyle(
fontSize: SizeConfig fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 3.6,
.getTextMultiplierBasedOnWidth() *
3.6,
letterSpacing: -0.48, letterSpacing: -0.48,
color: Color(0xFF2B353E), color: Color(0xFF2B353E),
), ),
@ -408,29 +301,14 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage>
height: 6, height: 6,
), ),
Row( Row(
mainAxisAlignment: mainAxisAlignment: MainAxisAlignment.start,
MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
crossAxisAlignment:
CrossAxisAlignment.start,
children: [ children: [
SizedBox( SizedBox(
height: 6, height: 6,
), ),
AppText( AppText((assessment.remark != null && assessment.remark != '') ? TranslationBase.of(context).remarks + " : " : '',
(assessment.remark != null && fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 3, color: Color(0xFF2E303A), fontFamily: 'Poppins', fontWeight: FontWeight.w600),
assessment.remark !=
'')
? TranslationBase.of(
context)
.remarks +
" : "
: '',
fontSize: SizeConfig
.getTextMultiplierBasedOnWidth() *
3,
color: Color(0xFF2E303A),
fontFamily: 'Poppins',
fontWeight: FontWeight.w600),
RemarkText( RemarkText(
remark: assessment.remark ?? "", remark: assessment.remark ?? "",
), ),
@ -439,22 +317,14 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage>
], ],
), ),
Column( Column(
crossAxisAlignment: crossAxisAlignment: CrossAxisAlignment.end,
CrossAxisAlignment.end,
children: [ children: [
SizedBox( SizedBox(
height: MediaQuery.of(context) height: MediaQuery.of(context).size.height * 0.05,
.size
.height *
0.05,
), ),
InkWell( InkWell(
onTap: () { onTap: () {
openAssessmentDialog(context, openAssessmentDialog(context, isUpdate: true, assessment: assessment, model: model);
isUpdate: true,
assessment: assessment,
model: model);
}, },
child: Icon( child: Icon(
DoctorApp.edit, DoctorApp.edit,
@ -488,11 +358,9 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage>
); );
} }
openAssessmentDialog(BuildContext context, openAssessmentDialog(BuildContext context, {MySelectedAssessment assessment, bool isUpdate, SOAPViewModel model}) {
{MySelectedAssessment assessment, bool isUpdate, SOAPViewModel model}) {
if (assessment == null) { if (assessment == null) {
assessment = SoapUtils.generateMySelectedAssessment( assessment = SoapUtils.generateMySelectedAssessment(remark: '', appointmentNo: widget.patientInfo.appointmentNo);
remark: '', appointmentNo: widget.patientInfo.appointmentNo);
} }
showModalBottomSheet( showModalBottomSheet(
backgroundColor: Colors.white, backgroundColor: Colors.white,
@ -504,11 +372,9 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage>
patientInfo: widget.patientInfo, patientInfo: widget.patientInfo,
isUpdate: isUpdate, isUpdate: isUpdate,
mySelectedAssessmentList: mySelectedAssessmentList, mySelectedAssessmentList: mySelectedAssessmentList,
addSelectedAssessment: (MySelectedAssessment mySelectedAssessment, addSelectedAssessment: (MySelectedAssessment mySelectedAssessment, bool isUpdate) async {
bool isUpdate) async {
setState(() { setState(() {
if (!isUpdate) if (!isUpdate) mySelectedAssessmentList.add(mySelectedAssessment);
mySelectedAssessmentList.add(mySelectedAssessment);
}); });
}); });
}); });

@ -29,6 +29,7 @@ class DrugToDrug extends StatefulWidget {
class _DrugToDrug extends State<DrugToDrug> { class _DrugToDrug extends State<DrugToDrug> {
int typeID = 1; int typeID = 1;
bool isLoaded = false; bool isLoaded = false;
/// TODO Elham* fix this /// TODO Elham* fix this
List<Map<dynamic, dynamic>> expandableList = [ List<Map<dynamic, dynamic>> expandableList = [
{'name': 'CRITICAL', 'level': 'LEVEL_4'}, {'name': 'CRITICAL', 'level': 'LEVEL_4'},
@ -38,7 +39,6 @@ class _DrugToDrug extends State<DrugToDrug> {
{'name': 'INFO', 'level': 'INFO'}, {'name': 'INFO', 'level': 'INFO'},
]; ];
VitalSignsViewModel vitalSignsViewModel = new VitalSignsViewModel(); VitalSignsViewModel vitalSignsViewModel = new VitalSignsViewModel();
SOAPViewModel soapViewModel = new SOAPViewModel(); SOAPViewModel soapViewModel = new SOAPViewModel();
@ -53,49 +53,31 @@ class _DrugToDrug extends State<DrugToDrug> {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return isLoaded == true return isLoaded == true
? BaseView<PrescriptionViewModel>( ? BaseView<PrescriptionViewModel>(
onModelReady: (prescriptionViewModel) => prescriptionViewModel.getDrugToDrug( onModelReady: (prescriptionViewModel) =>
vitalSignsViewModel.patientVitalSigns, prescriptionViewModel.getDrugToDrug(vitalSignsViewModel.patientVitalSigns, widget.listAssessment, soapViewModel.patientAllergiesList, widget.patient, widget.prescription),
widget.listAssessment, builder: (BuildContext context, PrescriptionViewModel prescriptionViewModel, Widget child) => NetworkBaseView(
soapViewModel.patientAllergiesList, baseViewModel: prescriptionViewModel,
widget.patient, child: Container(
widget.prescription), height: SizeConfig.realScreenHeight * .9,
builder: (BuildContext context, PrescriptionViewModel prescriptionViewModel, child: new ListView.builder(
Widget child) => itemCount: expandableList.length,
NetworkBaseView( itemBuilder: (context, i) {
baseViewModel: prescriptionViewModel, return new ExpansionTile(
child: Container( title: new AppText(
height: SizeConfig.realScreenHeight * .9, expandableList[i]['name'] + ' ' + '(' + getDrugInfo(expandableList[i]['level'], prescriptionViewModel).length.toString() + ')',
child: new ListView.builder( fontSize: 20,
itemCount: expandableList.length, fontWeight: FontWeight.bold,
itemBuilder: (context, i) { ),
return new ExpansionTile( children: getDrugInfo(expandableList[i]['level'], prescriptionViewModel).map((item) {
title: new AppText( return Container(
expandableList[i]['name'] + padding: EdgeInsets.all(10),
' ' + child: AppText(
'(' + item['comment'],
getDrugInfo(expandableList[i]['level'], color: Colors.red[900],
prescriptionViewModel) ));
.length }).toList());
.toString() + }))))
')', : Container(height: SizeConfig.realScreenHeight * .45, child: GifLoaderContainer());
fontSize: 20,
fontWeight: FontWeight.bold,
),
children: getDrugInfo(
expandableList[i]['level'], prescriptionViewModel)
.map((item) {
return Container(
padding: EdgeInsets.all(10),
child: AppText(
item['comment'],
color: Colors.red[900],
));
}).toList());
}))))
: Container(
height: SizeConfig.realScreenHeight * .45,
child: GifLoaderContainer()
);
} }
getTypeID() async { getTypeID() async {
@ -106,14 +88,12 @@ class _DrugToDrug extends State<DrugToDrug> {
} }
getRequestedData() async { getRequestedData() async {
GeneralGetReqForSOAP generalGetReqForSOAP = GeneralGetReqForSOAP( GeneralGetReqForSOAP generalGetReqForSOAP = GeneralGetReqForSOAP(
/// TODO Elham* fix this today
/// TODO Elham* fix this today
patientMRN: widget.patient.patientMRN, patientMRN: widget.patient.patientMRN,
episodeId: widget.patient.episodeNo, episodeId: widget.patient.episodeNo,
appointmentNo: appointmentNo: widget.patient.appointmentNo,
widget.patient.appointmentNo,
doctorID: '', doctorID: '',
editedBy: ''); editedBy: '');

@ -35,13 +35,7 @@ class PrescriptionFormWidget extends StatefulWidget {
final MedicineViewModel medicineViewModel; final MedicineViewModel medicineViewModel;
final GetMedicationResponseModel selectedMedication; final GetMedicationResponseModel selectedMedication;
const PrescriptionFormWidget( const PrescriptionFormWidget({Key key, this.patient, this.prescriptionList, this.prescriptionViewModel, this.medicineViewModel, this.selectedMedication});
{Key key,
this.patient,
this.prescriptionList,
this.prescriptionViewModel,
this.medicineViewModel,
this.selectedMedication});
@override @override
_PrescriptionFormWidgetState createState() => _PrescriptionFormWidgetState(); _PrescriptionFormWidgetState createState() => _PrescriptionFormWidgetState();
@ -67,8 +61,7 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
DateTime selectedDate = DateTime.now(); DateTime selectedDate = DateTime.now();
int strengthChar; int strengthChar;
GlobalKey key = GlobalKey key = new GlobalKey<AutoCompleteTextFieldState<GetMedicationResponseModel>>();
new GlobalKey<AutoCompleteTextFieldState<GetMedicationResponseModel>>();
TextEditingController drugIdController = TextEditingController(); TextEditingController drugIdController = TextEditingController();
TextEditingController doseController = TextEditingController(); TextEditingController doseController = TextEditingController();
@ -97,8 +90,7 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
onVoiceText() async { onVoiceText() async {
new SpeechToText(context: context).showAlertDialog(context); new SpeechToText(context: context).showAlertDialog(context);
var lang = TranslationBase.of(AppGlobal.CONTEX).locale.languageCode; var lang = TranslationBase.of(AppGlobal.CONTEX).locale.languageCode;
bool available = await speech.initialize( bool available = await speech.initialize(onStatus: statusListener, onError: errorListener);
onStatus: statusListener, onError: errorListener);
if (available) { if (available) {
speech.listen( speech.listen(
onResult: resultListener, onResult: resultListener,
@ -135,8 +127,7 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
} }
Future<void> initSpeechState() async { Future<void> initSpeechState() async {
bool hasSpeech = await speech.initialize( bool hasSpeech = await speech.initialize(onError: errorListener, onStatus: statusListener);
onError: errorListener, onStatus: statusListener);
print(hasSpeech); print(hasSpeech);
if (!mounted) return; if (!mounted) return;
} }
@ -185,7 +176,7 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
children: [ children: [
Container( Container(
width: MediaQuery.of(context).size.width * 0.35, width: MediaQuery.of(context).size.width * 0.35,
child: AppTextFieldCustom( child: AppTextFieldCustom(
validationError: strengthError, validationError: strengthError,
hintText: TranslationBase.of(context).strength, hintText: TranslationBase.of(context).strength,
isTextFieldHasSuffix: false, isTextFieldHasSuffix: false,
@ -197,8 +188,7 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
}); });
if (strengthChar >= 5) { if (strengthChar >= 5) {
DrAppToastMsg.showErrorToast( DrAppToastMsg.showErrorToast(
TranslationBase.of(context) TranslationBase.of(context).only5DigitsAllowedForStrength,
.only5DigitsAllowedForStrength,
); );
} }
}, },
@ -212,10 +202,7 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
), ),
PrescriptionTextFiled( PrescriptionTextFiled(
width: MediaQuery.of(context).size.width * 0.510, width: MediaQuery.of(context).size.width * 0.510,
element: element: widget.medicineViewModel.itemMedicineListUnit.length == 1 ? widget.medicineViewModel.itemMedicineListUnit[0] : units,
widget.medicineViewModel.itemMedicineListUnit.length == 1
? widget.medicineViewModel.itemMedicineListUnit[0]
: units,
elementError: unitError, elementError: unitError,
keyName: 'description', keyName: 'description',
keyId: 'parameterCode', keyId: 'parameterCode',
@ -233,9 +220,7 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
SizedBox(height: spaceBetweenTextFields), SizedBox(height: spaceBetweenTextFields),
PrescriptionTextFiled( PrescriptionTextFiled(
elementList: widget.medicineViewModel.itemMedicineListRoute, elementList: widget.medicineViewModel.itemMedicineListRoute,
element: widget.medicineViewModel.itemMedicineListRoute.length == 1 element: widget.medicineViewModel.itemMedicineListRoute.length == 1 ? route = widget.medicineViewModel.itemMedicineListRoute[0] : route,
? route = widget.medicineViewModel.itemMedicineListRoute[0]
: route,
elementError: routeError, elementError: routeError,
keyId: 'parameterCode', keyId: 'parameterCode',
keyName: 'description', keyName: 'description',
@ -252,9 +237,7 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
hintText: TranslationBase.of(context).frequency, hintText: TranslationBase.of(context).frequency,
elementError: frequencyError, elementError: frequencyError,
// element: frequency, // element: frequency,
element: widget.medicineViewModel.itemMedicineListRoute.length == 1 element: widget.medicineViewModel.itemMedicineListRoute.length == 1 ? frequency = widget.medicineViewModel.itemMedicineListRoute[0] : frequency,
? frequency = widget.medicineViewModel.itemMedicineListRoute[0]
: frequency,
elementList: widget.medicineViewModel.itemMedicineList, elementList: widget.medicineViewModel.itemMedicineList,
keyId: 'parameterCode', keyId: 'parameterCode',
keyName: 'description', keyName: 'description',
@ -262,15 +245,9 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
setState(() { setState(() {
frequency = selectedValue; frequency = selectedValue;
frequency['isDefault'] = true; frequency['isDefault'] = true;
if (widget.selectedMedication != null && if (widget.selectedMedication != null && duration != null && frequency != null && strengthController.text != null) {
duration != null && widget.medicineViewModel
frequency != null && .getBoxQuantity(freq: frequency['parameterCode'], duration: duration['id'], itemCode: widget.selectedMedication.itemId, strength: double.parse(strengthController.text));
strengthController.text != null) {
widget.medicineViewModel.getBoxQuantity(
freq: frequency['parameterCode'],
duration: duration['id'],
itemCode: widget.selectedMedication.itemId,
strength: double.parse(strengthController.text));
return; return;
} }
@ -300,9 +277,7 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
Container( Container(
width: MediaQuery.of(context).size.width * 0.29, width: MediaQuery.of(context).size.width * 0.29,
child: AppTextFieldCustom( child: AppTextFieldCustom(
hintText: widget hintText: widget.medicineViewModel.patientAssessmentList[0].icdCode10ID.toString(),
.medicineViewModel.patientAssessmentList[0].icdCode10ID
.toString(),
enabled: true, enabled: true,
), ),
), ),
@ -311,16 +286,15 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
color: Colors.white, color: Colors.white,
child: AppTextFieldCustom( child: AppTextFieldCustom(
maxLines: 5, maxLines: 5,
hintText: widget hintText: widget.medicineViewModel.patientAssessmentList[0].asciiDesc.toString(),
.medicineViewModel.patientAssessmentList[0].asciiDesc
.toString(),
enabled: true, enabled: true,
), ),
), ),
], ],
), ),
), ),
SizedBox(height: spaceBetweenTextFields), Container( SizedBox(height: spaceBetweenTextFields),
Container(
color: Colors.transparent, color: Colors.transparent,
child: InkWell( child: InkWell(
onTap: () => selectDate(context, widget.prescriptionViewModel), onTap: () => selectDate(context, widget.prescriptionViewModel),
@ -334,9 +308,7 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
color: Colors.black, color: Colors.black,
), ),
), ),
dropDownText: selectedDate != null dropDownText: selectedDate != null ? "${AppDateUtils.convertStringToDateFormat(selectedDate.toString(), "yyyy-MM-dd")}" : null,
? "${AppDateUtils.convertStringToDateFormat(selectedDate.toString(), "yyyy-MM-dd")}"
: null,
enabled: false, enabled: false,
), ),
), ),
@ -352,10 +324,7 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
okFunction: (selectedValue) { okFunction: (selectedValue) {
setState(() { setState(() {
duration = selectedValue; duration = selectedValue;
if (widget.selectedMedication != null && if (widget.selectedMedication != null && duration != null && frequency != null && strengthController.text != null) {
duration != null &&
frequency != null &&
strengthController.text != null) {
box = widget.medicineViewModel.boxQuintity; box = widget.medicineViewModel.boxQuintity;
return; return;
} }
@ -378,17 +347,13 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
child: AppTextFieldCustom( child: AppTextFieldCustom(
hintText: TranslationBase.of(context).boxQuantity, hintText: TranslationBase.of(context).boxQuantity,
isTextFieldHasSuffix: false, isTextFieldHasSuffix: false,
dropDownText: box != null dropDownText: box != null ? widget.medicineViewModel.boxQuintity.toString() : null,
? widget.medicineViewModel.boxQuintity.toString()
: null,
enabled: false, enabled: false,
), ),
), ),
SizedBox(height: spaceBetweenTextFields), SizedBox(height: spaceBetweenTextFields),
Container( Container(
decoration: BoxDecoration( decoration: BoxDecoration(borderRadius: BorderRadius.all(Radius.circular(6.0)), border: Border.all(width: 1.0, color: HexColor("#CCCCCC"))),
borderRadius: BorderRadius.all(Radius.circular(6.0)),
border: Border.all(width: 1.0, color: HexColor("#CCCCCC"))),
child: Stack( child: Stack(
children: [ children: [
TextFields( TextFields(
@ -459,14 +424,9 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
eventCategory: "Add Prescription Form", eventCategory: "Add Prescription Form",
eventAction: "Add Prescription", eventAction: "Add Prescription",
); );
if (duration != null && if (duration != null && doseTime != null && frequency != null && selectedDate != null && strengthController.text != "") {
doseTime != null &&
frequency != null &&
selectedDate != null &&
strengthController.text != "") {
if (widget.selectedMedication.isNarcotic == true) { if (widget.selectedMedication.isNarcotic == true) {
DrAppToastMsg.showErrorToast(TranslationBase.of(context) DrAppToastMsg.showErrorToast(TranslationBase.of(context).narcoticMedicineCanOnlyBePrescribedFromVida);
.narcoticMedicineCanOnlyBePrescribedFromVida);
Navigator.pop(context); Navigator.pop(context);
return; return;
} }

@ -37,21 +37,13 @@ class PrescriptionCheckOutScreen extends StatefulWidget {
final List<PrescriptionModel> prescriptionList; final List<PrescriptionModel> prescriptionList;
final ProcedureTempleteDetailsModel groupProcedures; final ProcedureTempleteDetailsModel groupProcedures;
const PrescriptionCheckOutScreen( const PrescriptionCheckOutScreen({Key key, this.model, this.patient, this.prescriptionList, this.groupProcedures}) : super(key: key);
{Key key,
this.model,
this.patient,
this.prescriptionList,
this.groupProcedures})
: super(key: key);
@override @override
_PrescriptionCheckOutScreenState createState() => _PrescriptionCheckOutScreenState createState() => _PrescriptionCheckOutScreenState();
_PrescriptionCheckOutScreenState();
} }
class _PrescriptionCheckOutScreenState class _PrescriptionCheckOutScreenState extends State<PrescriptionCheckOutScreen> {
extends State<PrescriptionCheckOutScreen> {
postPrescription( postPrescription(
{String duration, {String duration,
String doseTimeIn, String doseTimeIn,
@ -68,8 +60,7 @@ class _PrescriptionCheckOutScreenState
String icdCode, String icdCode,
PatiantInformtion patient, PatiantInformtion patient,
String patientType}) async { String patientType}) async {
PostPrescriptionReqModel postProcedureReqModel = PostPrescriptionReqModel postProcedureReqModel = new PostPrescriptionReqModel();
new PostPrescriptionReqModel();
List<PrescriptionRequestModel> prescriptionList = List(); List<PrescriptionRequestModel> prescriptionList = List();
postProcedureReqModel.appointmentNo = patient.appointmentNo; postProcedureReqModel.appointmentNo = patient.appointmentNo;
@ -121,8 +112,7 @@ class _PrescriptionCheckOutScreenState
DateTime selectedDate; DateTime selectedDate;
int strengthChar; int strengthChar;
GetMedicationResponseModel _selectedMedication; GetMedicationResponseModel _selectedMedication;
GlobalKey key = GlobalKey key = new GlobalKey<AutoCompleteTextFieldState<GetMedicationResponseModel>>();
new GlobalKey<AutoCompleteTextFieldState<GetMedicationResponseModel>>();
TextEditingController drugIdController = TextEditingController(); TextEditingController drugIdController = TextEditingController();
TextEditingController doseController = TextEditingController(); TextEditingController doseController = TextEditingController();
@ -160,8 +150,7 @@ class _PrescriptionCheckOutScreenState
onVoiceText() async { onVoiceText() async {
new SpeechToText(context: context).showAlertDialog(context); new SpeechToText(context: context).showAlertDialog(context);
var lang = TranslationBase.of(AppGlobal.CONTEX).locale.languageCode; var lang = TranslationBase.of(AppGlobal.CONTEX).locale.languageCode;
bool available = await speech.initialize( bool available = await speech.initialize(onStatus: statusListener, onError: errorListener);
onStatus: statusListener, onError: errorListener);
if (available) { if (available) {
speech.listen( speech.listen(
onResult: resultListener, onResult: resultListener,
@ -204,8 +193,7 @@ class _PrescriptionCheckOutScreenState
} }
Future<void> initSpeechState() async { Future<void> initSpeechState() async {
bool hasSpeech = await speech.initialize( bool hasSpeech = await speech.initialize(onError: errorListener, onStatus: statusListener);
onError: errorListener, onStatus: statusListener);
print(hasSpeech); print(hasSpeech);
if (!mounted) return; if (!mounted) return;
} }
@ -222,19 +210,13 @@ class _PrescriptionCheckOutScreenState
return BaseView<MedicineViewModel>( return BaseView<MedicineViewModel>(
onModelReady: (model) async { onModelReady: (model) async {
// TODO Elham* move this logic to the model // TODO Elham* move this logic to the model
model.getItem( model.getItem(itemID: int.parse(widget.groupProcedures.aliasN.replaceAll("item code ;", "")));
itemID: int.parse(
widget.groupProcedures.aliasN.replaceAll("item code ;", "")));
x = model.patientAssessmentList.map((element) { x = model.patientAssessmentList.map((element) {
return element.icdCode10ID; return element.icdCode10ID;
}); });
GetAssessmentReqModel getAssessmentReqModel = GetAssessmentReqModel( GetAssessmentReqModel getAssessmentReqModel =
patientMRN: widget.patient.patientMRN, GetAssessmentReqModel(patientMRN: widget.patient.patientMRN, episodeID: widget.patient.episodeNo.toString(), editedBy: '', doctorID: '', appointmentNo: widget.patient.appointmentNo);
episodeID: widget.patient.episodeNo.toString(),
editedBy: '',
doctorID: '',
appointmentNo: widget.patient.appointmentNo);
if (model.medicationStrengthList.length == 0) { if (model.medicationStrengthList.length == 0) {
await model.getMedicationStrength(); await model.getMedicationStrength();
} }
@ -265,8 +247,7 @@ class _PrescriptionCheckOutScreenState
height: MediaQuery.of(context).size.height * 1.35, height: MediaQuery.of(context).size.height * 1.35,
color: Color(0xffF8F8F8), color: Color(0xffF8F8F8),
child: Padding( child: Padding(
padding: padding: EdgeInsets.symmetric(horizontal: 12.0, vertical: 10.0),
EdgeInsets.symmetric(horizontal: 12.0, vertical: 10.0),
child: Column( child: Column(
children: [ children: [
Column( Column(
@ -290,8 +271,7 @@ class _PrescriptionCheckOutScreenState
width: 7.0, width: 7.0,
), ),
AppText( AppText(
TranslationBase.of(context) TranslationBase.of(context).newPrescriptionOrder,
.newPrescriptionOrder,
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
fontSize: 20, fontSize: 20,
), ),
@ -325,16 +305,14 @@ class _PrescriptionCheckOutScreenState
child: Column( child: Column(
children: [ children: [
AppText( AppText(
widget.groupProcedures.procedureName ?? widget.groupProcedures.procedureName ?? "",
"",
bold: true, bold: true,
), ),
Container( Container(
child: Row( child: Row(
children: [ children: [
AppText( AppText(
TranslationBase.of(context) TranslationBase.of(context).orderType,
.orderType,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
), ),
Radio( Radio(
@ -345,8 +323,7 @@ class _PrescriptionCheckOutScreenState
setSelectedType(value); setSelectedType(value);
}, },
), ),
Text(TranslationBase.of(context) Text(TranslationBase.of(context).regular),
.regular),
], ],
), ),
), ),
@ -356,10 +333,7 @@ class _PrescriptionCheckOutScreenState
child: Row( child: Row(
children: [ children: [
Container( Container(
width: MediaQuery.of(context) width: MediaQuery.of(context).size.width * 0.35,
.size
.width *
0.35,
child: AppTextFieldCustom( child: AppTextFieldCustom(
height: 40, height: 40,
validationError: strengthError, validationError: strengthError,
@ -372,16 +346,12 @@ class _PrescriptionCheckOutScreenState
strengthChar = value.length; strengthChar = value.length;
}); });
if (strengthChar >= 5) { if (strengthChar >= 5) {
DrAppToastMsg DrAppToastMsg.showErrorToast(
.showErrorToast( TranslationBase.of(context).only5DigitsAllowedForStrength,
TranslationBase.of(
context)
.only5DigitsAllowedForStrength,
); );
} }
}, },
inputType: TextInputType inputType: TextInputType.numberWithOptions(
.numberWithOptions(
decimal: true, decimal: true,
), ),
), ),
@ -390,17 +360,13 @@ class _PrescriptionCheckOutScreenState
width: 5.0, width: 5.0,
), ),
PrescriptionTextFiled( PrescriptionTextFiled(
width: MediaQuery.of(context) width: MediaQuery.of(context).size.width * 0.560,
.size
.width *
0.560,
element: units, element: units,
elementError: unitError, elementError: unitError,
keyName: 'description', keyName: 'description',
keyId: 'parameterCode', keyId: 'parameterCode',
hintText: 'Select', hintText: 'Select',
elementList: elementList: model.itemMedicineListUnit,
model.itemMedicineListUnit,
okFunction: (selectedValue) { okFunction: (selectedValue) {
setState(() { setState(() {
units = selectedValue; units = selectedValue;
@ -413,8 +379,7 @@ class _PrescriptionCheckOutScreenState
), ),
SizedBox(height: spaceBetweenTextFields), SizedBox(height: spaceBetweenTextFields),
PrescriptionTextFiled( PrescriptionTextFiled(
elementList: elementList: model.itemMedicineListRoute,
model.itemMedicineListRoute,
element: route, element: route,
elementError: routeError, elementError: routeError,
keyId: 'parameterCode', keyId: 'parameterCode',
@ -425,13 +390,11 @@ class _PrescriptionCheckOutScreenState
route['isDefault'] = true; route['isDefault'] = true;
}); });
}, },
hintText: hintText: TranslationBase.of(context).route,
TranslationBase.of(context).route,
), ),
SizedBox(height: spaceBetweenTextFields), SizedBox(height: spaceBetweenTextFields),
PrescriptionTextFiled( PrescriptionTextFiled(
hintText: TranslationBase.of(context) hintText: TranslationBase.of(context).frequency,
.frequency,
elementError: frequencyError, elementError: frequencyError,
element: frequency, element: frequency,
elementList: model.itemMedicineList, elementList: model.itemMedicineList,
@ -441,21 +404,9 @@ class _PrescriptionCheckOutScreenState
setState(() { setState(() {
frequency = selectedValue; frequency = selectedValue;
frequency['isDefault'] = true; frequency['isDefault'] = true;
if (_selectedMedication != null && if (_selectedMedication != null && duration != null && frequency != null && strengthController.text != null) {
duration != null &&
frequency != null &&
strengthController.text !=
null) {
model.getBoxQuantity( model.getBoxQuantity(
freq: frequency[ freq: frequency['parameterCode'], duration: duration['id'], itemCode: _selectedMedication.itemId, strength: double.parse(strengthController.text));
'parameterCode'],
duration: duration['id'],
itemCode:
_selectedMedication
.itemId,
strength: double.parse(
strengthController
.text));
return; return;
} }
@ -463,12 +414,10 @@ class _PrescriptionCheckOutScreenState
}), }),
SizedBox(height: spaceBetweenTextFields), SizedBox(height: spaceBetweenTextFields),
PrescriptionTextFiled( PrescriptionTextFiled(
hintText: TranslationBase.of(context) hintText: TranslationBase.of(context).doseTime,
.doseTime,
elementError: doseTimeError, elementError: doseTimeError,
element: doseTime, element: doseTime,
elementList: elementList: model.medicationDoseTimeList,
model.medicationDoseTimeList,
keyId: 'id', keyId: 'id',
keyName: 'nameEn', keyName: 'nameEn',
okFunction: (selectedValue) { okFunction: (selectedValue) {
@ -477,8 +426,7 @@ class _PrescriptionCheckOutScreenState
}); });
}), }),
SizedBox(height: spaceBetweenTextFields), SizedBox(height: spaceBetweenTextFields),
if (model if (model.patientAssessmentList.isNotEmpty)
.patientAssessmentList.isNotEmpty)
Container( Container(
height: screenSize.height * 0.070, height: screenSize.height * 0.070,
width: double.infinity, width: double.infinity,
@ -486,47 +434,19 @@ class _PrescriptionCheckOutScreenState
child: Row( child: Row(
children: [ children: [
Container( Container(
width: MediaQuery.of(context) width: MediaQuery.of(context).size.width * 0.29,
.size
.width *
0.29,
child: TextField( child: TextField(
decoration: decoration: textFieldSelectorDecoration(model.patientAssessmentList[0].icdCode10ID.toString(), indication != null ? indication['name'] : null, false),
textFieldSelectorDecoration(
model
.patientAssessmentList[
0]
.icdCode10ID
.toString(),
indication != null
? indication[
'name']
: null,
false),
enabled: true, enabled: true,
readOnly: true, readOnly: true,
), ),
), ),
Container( Container(
width: MediaQuery.of(context) width: MediaQuery.of(context).size.width * 0.65,
.size
.width *
0.65,
color: Colors.white, color: Colors.white,
child: TextField( child: TextField(
maxLines: 5, maxLines: 5,
decoration: decoration: textFieldSelectorDecoration(model.patientAssessmentList[0].asciiDesc.toString(), indication != null ? indication['name'] : null, false),
textFieldSelectorDecoration(
model
.patientAssessmentList[
0]
.asciiDesc
.toString(),
indication != null
? indication[
'name']
: null,
false),
enabled: true, enabled: true,
readOnly: true, readOnly: true,
), ),
@ -539,16 +459,10 @@ class _PrescriptionCheckOutScreenState
height: screenSize.height * 0.070, height: screenSize.height * 0.070,
color: Colors.white, color: Colors.white,
child: InkWell( child: InkWell(
onTap: () => onTap: () => selectDate(context, widget.model),
selectDate(context, widget.model),
child: TextField( child: TextField(
decoration: textFieldSelectorDecoration( decoration: textFieldSelectorDecoration(TranslationBase.of(context).date,
TranslationBase.of(context) selectedDate != null ? "${AppDateUtils.convertStringToDateFormat(selectedDate.toString(), "yyyy-MM-dd")}" : null, true,
.date,
selectedDate != null
? "${AppDateUtils.convertStringToDateFormat(selectedDate.toString(), "yyyy-MM-dd")}"
: null,
true,
suffixIcon: Icon( suffixIcon: Icon(
Icons.calendar_today, Icons.calendar_today,
color: Colors.black, color: Colors.black,
@ -561,28 +475,19 @@ class _PrescriptionCheckOutScreenState
PrescriptionTextFiled( PrescriptionTextFiled(
element: duration, element: duration,
elementError: durationError, elementError: durationError,
hintText: TranslationBase.of(context) hintText: TranslationBase.of(context).duration,
.duration, elementList: model.medicationDurationList,
elementList:
model.medicationDurationList,
keyName: 'nameEn', keyName: 'nameEn',
keyId: 'id', keyId: 'id',
okFunction: (selectedValue) { okFunction: (selectedValue) {
setState(() { setState(() {
duration = selectedValue; duration = selectedValue;
if (_selectedMedication != null && if (_selectedMedication != null && duration != null && frequency != null && strengthController.text != null) {
duration != null &&
frequency != null &&
strengthController.text !=
null) {
model.getBoxQuantity( model.getBoxQuantity(
freq: freq: frequency['parameterCode'],
frequency['parameterCode'],
duration: duration['id'], duration: duration['id'],
itemCode: itemCode: _selectedMedication.itemId,
_selectedMedication.itemId, strength: double.parse(strengthController.text),
strength: double.parse(
strengthController.text),
); );
box = model.boxQuintity; box = model.boxQuintity;
@ -595,20 +500,13 @@ class _PrescriptionCheckOutScreenState
SizedBox(height: spaceBetweenTextFields), SizedBox(height: spaceBetweenTextFields),
SizedBox(height: spaceBetweenTextFields), SizedBox(height: spaceBetweenTextFields),
Container( Container(
decoration: BoxDecoration( decoration: BoxDecoration(borderRadius: BorderRadius.all(Radius.circular(6.0)), border: Border.all(width: 1.0, color: HexColor("#CCCCCC"))),
borderRadius: BorderRadius.all(
Radius.circular(6.0)),
border: Border.all(
width: 1.0,
color: HexColor("#CCCCCC"))),
child: Stack( child: Stack(
children: [ children: [
TextFields( TextFields(
maxLines: 6, maxLines: 6,
minLines: 4, minLines: 4,
hintText: hintText: TranslationBase.of(context).instruction,
TranslationBase.of(context)
.instruction,
controller: instructionController, controller: instructionController,
//keyboardType: TextInputType.number, //keyboardType: TextInputType.number,
), ),
@ -622,9 +520,7 @@ class _PrescriptionCheckOutScreenState
size: 35, size: 35,
), ),
onPressed: () { onPressed: () {
initSpeechState().then( initSpeechState().then((value) => {onVoiceText()});
(value) =>
{onVoiceText()});
}, },
), ),
), ),
@ -633,15 +529,13 @@ class _PrescriptionCheckOutScreenState
), ),
SizedBox(height: spaceBetweenTextFields), SizedBox(height: spaceBetweenTextFields),
Container( Container(
margin: EdgeInsets.all( margin: EdgeInsets.all(SizeConfig.widthMultiplier * 5),
SizeConfig.widthMultiplier * 5),
child: Wrap( child: Wrap(
alignment: WrapAlignment.center, alignment: WrapAlignment.center,
children: <Widget>[ children: <Widget>[
AppButton( AppButton(
color: AppGlobal.appGreenColor, color: AppGlobal.appGreenColor,
title: TranslationBase.of(context) title: TranslationBase.of(context).addMedication,
.addMedication,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
onPressed: () async { onPressed: () async {
if (route != null && if (route != null &&
@ -650,101 +544,41 @@ class _PrescriptionCheckOutScreenState
frequency != null && frequency != null &&
units != null && units != null &&
selectedDate != null && selectedDate != null &&
strengthController.text != strengthController.text != "") {
"") { if (double.parse(strengthController.text) > 1000.0) {
if (double.parse(
strengthController
.text) >
1000.0) {
DrAppToastMsg.showErrorToast( DrAppToastMsg.showErrorToast(
TranslationBase.of(context).thousandIsTheMAXForTheStrength,); TranslationBase.of(context).thousandIsTheMAXForTheStrength,
);
return; return;
} }
if (double.parse( if (double.parse(strengthController.text) < 0.0) {
strengthController
.text) <
0.0) {
DrAppToastMsg.showErrorToast( DrAppToastMsg.showErrorToast(
TranslationBase.of(context).strengthCanNotBeZero,); TranslationBase.of(context).strengthCanNotBeZero,
);
return; return;
} }
if (formKey.currentState if (formKey.currentState.validate()) {
.validate()) {
Navigator.pop(context); Navigator.pop(context);
{ {
postPrescription( postPrescription(
icdCode: model icdCode: model.patientAssessmentList.isNotEmpty
.patientAssessmentList ? model.patientAssessmentList[0].icdCode10ID.isEmpty
.isNotEmpty
? model
.patientAssessmentList[
0]
.icdCode10ID
.isEmpty
? "test" ? "test"
: model : model.patientAssessmentList[0].icdCode10ID.toString()
.patientAssessmentList[
0]
.icdCode10ID
.toString()
: "test", : "test",
dose: strengthController dose: strengthController.text,
.text, doseUnit:
doseUnit: model model.itemMedicineListUnit.length == 1 ? model.itemMedicineListUnit[0]['parameterCode'].toString() : units['parameterCode'].toString(),
.itemMedicineListUnit
.length ==
1
? model
.itemMedicineListUnit[
0][
'parameterCode']
.toString()
: units['parameterCode']
.toString(),
patient: widget.patient, patient: widget.patient,
doseTimeIn: doseTimeIn: doseTime['id'].toString(),
doseTime['id']
.toString(),
model: widget.model, model: widget.model,
duration: duration['id'] duration: duration['id'].toString(),
.toString(), frequency: model.itemMedicineList.length == 1 ? model.itemMedicineList[0]['parameterCode'].toString() : frequency['parameterCode'].toString(),
frequency: model route: model.itemMedicineListRoute.length == 1 ? model.itemMedicineListRoute[0]['parameterCode'].toString() : route['parameterCode'].toString(),
.itemMedicineList drugId: (widget.groupProcedures.aliasN.replaceAll("item code ;", "")),
.length == strength: strengthController.text,
1 indication: indicationController.text,
? model instruction: instructionController.text,
.itemMedicineList[
0][
'parameterCode']
.toString()
: frequency[
'parameterCode']
.toString(),
route: model.itemMedicineListRoute
.length ==
1
? model
.itemMedicineListRoute[
0][
'parameterCode']
.toString()
: route['parameterCode']
.toString(),
drugId: (widget
.groupProcedures
.aliasN
.replaceAll(
"item code ;",
"")),
strength:
strengthController
.text,
indication:
indicationController
.text,
instruction:
instructionController
.text,
doseTime: selectedDate, doseTime: selectedDate,
); );
} }
@ -752,52 +586,32 @@ class _PrescriptionCheckOutScreenState
} else { } else {
setState(() { setState(() {
if (duration == null) { if (duration == null) {
durationError = durationError = TranslationBase.of(context).fieldRequired;
TranslationBase.of(
context)
.fieldRequired;
} else { } else {
durationError = null; durationError = null;
} }
if (doseTime == null) { if (doseTime == null) {
doseTimeError = doseTimeError = TranslationBase.of(context).fieldRequired;
TranslationBase.of(
context)
.fieldRequired;
} else { } else {
doseTimeError = null; doseTimeError = null;
} }
if (route == null) { if (route == null) {
routeError = routeError = TranslationBase.of(context).fieldRequired;
TranslationBase.of(
context)
.fieldRequired;
} else { } else {
routeError = null; routeError = null;
} }
if (frequency == null) { if (frequency == null) {
frequencyError = frequencyError = TranslationBase.of(context).fieldRequired;
TranslationBase.of(
context)
.fieldRequired;
} else { } else {
frequencyError = null; frequencyError = null;
} }
if (units == null) { if (units == null) {
unitError = unitError = TranslationBase.of(context).fieldRequired;
TranslationBase.of(
context)
.fieldRequired;
} else { } else {
unitError = null; unitError = null;
} }
if (strengthController if (strengthController.text == "") {
.text == strengthError = TranslationBase.of(context).fieldRequired;
"") {
strengthError =
TranslationBase.of(
context)
.fieldRequired;
} else { } else {
strengthError = null; strengthError = null;
} }
@ -849,9 +663,7 @@ class _PrescriptionCheckOutScreenState
/// TODO Elham* Use it from the textfeild utils /// TODO Elham* Use it from the textfeild utils
InputDecoration textFieldSelectorDecoration( InputDecoration textFieldSelectorDecoration(String hintText, String selectedText, bool isDropDown, {Icon suffixIcon}) {
String hintText, String selectedText, bool isDropDown,
{Icon suffixIcon}) {
return InputDecoration( return InputDecoration(
focusedBorder: OutlineInputBorder( focusedBorder: OutlineInputBorder(
borderSide: BorderSide(color: Color(0xFFCCCCCC), width: 2.0), borderSide: BorderSide(color: Color(0xFFCCCCCC), width: 2.0),

Loading…
Cancel
Save