prescription support ticket issue fixed

update_flutter_3.16.0_sdk-upgrade
haroon amjad 4 months ago
parent 80207d5942
commit 0e54255e0a

@ -415,7 +415,7 @@ const TRANSACTION_NO = 0;
const LANGUAGE_ID = 2; const LANGUAGE_ID = 2;
const STAMP = '2020-04-27T12:17:17.721Z'; const STAMP = '2020-04-27T12:17:17.721Z';
const IP_ADDRESS = '9.9.9.9'; const IP_ADDRESS = '9.9.9.9';
const VERSION_ID = 10.3; const VERSION_ID = 10.4;
const CHANNEL = 9; const CHANNEL = 9;
const SESSION_ID = 'BlUSkYymTt'; const SESSION_ID = 'BlUSkYymTt';
const IS_LOGIN_FOR_DOCTOR_APP = true; const IS_LOGIN_FOR_DOCTOR_APP = true;

@ -61,7 +61,7 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
bool visibilityPrescriptionForm = false; bool visibilityPrescriptionForm = false;
bool visibilitySearch = true; bool visibilitySearch = true;
DateTime selectedDate = DateTime.now(); DateTime? selectedDate;
int? strengthChar; int? strengthChar;
GlobalKey key = new GlobalKey<AutoCompleteTextFieldState<GetMedicationResponseModel>>(); GlobalKey key = new GlobalKey<AutoCompleteTextFieldState<GetMedicationResponseModel>>();
@ -97,10 +97,11 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
}); });
} }
getIcdCodeData() async{ getIcdCodeData() async {
await widget.prescriptionViewModel.getIcd10DISESECode(patient: widget.patient, itemID:widget.selectedMedication.itemId ); await widget.prescriptionViewModel.getIcd10DISESECode(patient: widget.patient, itemID: widget.selectedMedication.itemId);
icdCodeList = List.from(widget.prescriptionViewModel.icd10DeseaseItems); icdCodeList = List.from(widget.prescriptionViewModel.icd10DeseaseItems);
} }
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;
@ -217,7 +218,7 @@ getIcdCodeData() async{
), ),
PrescriptionTextFiled( PrescriptionTextFiled(
width: MediaQuery.of(context).size.width * 0.510, width: MediaQuery.of(context).size.width * 0.510,
element: widget.medicineViewModel.itemMedicineListUnit.length == 1 ? widget.medicineViewModel.itemMedicineListUnit[0] : units, element: widget.medicineViewModel.itemMedicineListUnit.length == 1 ? units = widget.medicineViewModel.itemMedicineListUnit[0] : units,
elementError: unitError, elementError: unitError,
keyName: 'description', keyName: 'description',
keyId: 'parameterCode', keyId: 'parameterCode',
@ -252,7 +253,7 @@ getIcdCodeData() async{
hintText: TranslationBase.of(context).frequency, hintText: TranslationBase.of(context).frequency,
elementError: frequencyError, elementError: frequencyError,
// element: frequency, // element: frequency,
element: widget.medicineViewModel.medicationFrequencyList.length == 1 ? frequency = widget.medicineViewModel.medicationFrequencyList[0] : frequency, element: widget.medicineViewModel.itemMedicineList.length == 1 ? frequency = widget.medicineViewModel.itemMedicineList[0] : frequency,
elementList: widget.medicineViewModel.itemMedicineList, elementList: widget.medicineViewModel.itemMedicineList,
keyId: 'parameterCode', keyId: 'parameterCode',
keyName: 'description', keyName: 'description',
@ -282,8 +283,9 @@ getIcdCodeData() async{
}); });
}), }),
SizedBox(height: spaceBetweenTextFields), SizedBox(height: spaceBetweenTextFields),
widget.prescriptionViewModel.icd10DeseaseItems.isNotEmpty ? widget.prescriptionViewModel.icd10DeseaseItems.isNotEmpty
// PrescriptionTextFiled( ?
// PrescriptionTextFiled(
// hintText: TranslationBase.of(context).nameOrICD, // hintText: TranslationBase.of(context).nameOrICD,
// elementError: icdCodeError, // elementError: icdCodeError,
// element: icdCode, // element: icdCode,
@ -296,98 +298,100 @@ getIcdCodeData() async{
// }); // });
// }) // })
Column( Column(children: [
children:[ InkWell( InkWell(
onTap: widget.prescriptionViewModel.icd10DeseaseItems != null onTap: widget.prescriptionViewModel.icd10DeseaseItems != null
? () { ? () {
icdCodeList = List.from(widget.prescriptionViewModel.icd10DeseaseItems); icdCodeList = List.from(widget.prescriptionViewModel.icd10DeseaseItems);
setState(() { setState(() {
icdCode = null; icdCode = null;
icdNameController.text = ''; icdNameController.text = '';
}); });
} }
: null, : null,
child: AppTextFieldCustom( child: AppTextFieldCustom(
validationError: icdCodeError, validationError: icdCodeError,
onChanged: (text){ onChanged: (text) {
icdCodeList = List.from(widget.prescriptionViewModel.icd10DeseaseItems); icdCodeList = List.from(widget.prescriptionViewModel.icd10DeseaseItems);
setState(() { setState(() {
icdNameController.text; icdNameController.text;
}); });
}, },
height: Utils.getTextFieldHeight(), height: Utils.getTextFieldHeight(),
onClick: widget.prescriptionViewModel.icd10DeseaseItems != null onClick: widget.prescriptionViewModel.icd10DeseaseItems != null
? () { ? () {
setState(() { setState(() {
icdCode = null; icdCode = null;
icdNameController.text = ''; icdNameController.text = '';
}); });
} }
: null, : null,
hintText: TranslationBase.of(context).nameOrICD, hintText: TranslationBase.of(context).nameOrICD,
maxLines: 1, maxLines: 1,
minLines: 1, minLines: 1,
controller: icdNameController, controller: icdNameController,
enabled:true, enabled: true,
isTextFieldHasSuffix: true, onFieldSubmitted: () { }, isTextFieldHasSuffix: true,
onFieldSubmitted: () {},
)), )),
icdCodeList.isNotEmpty && icdNameController.text.isNotEmpty
icdCodeList.isNotEmpty && icdNameController.text.isNotEmpty ? Container( ? Container(
color: Colors.white, color: Colors.white,
height: MediaQuery.of(context).size.height * 0.4, //height to 9% of screen height, height: MediaQuery.of(context).size.height * 0.4, //height to 9% of screen height,
child:ListView.builder( child: ListView.builder(
shrinkWrap: true, shrinkWrap: true,
itemCount:icdCodeList.length, itemCount: icdCodeList.length,
itemBuilder: (context, index) { itemBuilder: (context, index) {
return InkWell(child:ListTile( return InkWell(
title: AppText( widget.prescriptionViewModel.icd10DeseaseItems[index].asciiDesc + " / " + widget.prescriptionViewModel.icd10DeseaseItems[index].codeId.toString(), fontSize: 12.0)), child: ListTile(
onTap: (){ title: AppText(widget.prescriptionViewModel.icd10DeseaseItems[index].asciiDesc + " / " + widget.prescriptionViewModel.icd10DeseaseItems[index].codeId.toString(),
icdCode = widget.prescriptionViewModel.icd10DeseaseItems[index]; fontSize: 12.0)),
icdNameController.text = widget.prescriptionViewModel.icd10DeseaseItems[index].asciiDesc; onTap: () {
widget.medicineViewModel.patientAssessmentList[0].icdCode10ID = widget.prescriptionViewModel.icd10DeseaseItems[index].codeId; icdCode = widget.prescriptionViewModel.icd10DeseaseItems[index];
widget.medicineViewModel.patientAssessmentList[0].asciiDesc = widget.prescriptionViewModel.icd10DeseaseItems[index].asciiDesc; icdNameController.text = widget.prescriptionViewModel.icd10DeseaseItems[index].asciiDesc;
icdCodeList.clear(); if (widget.medicineViewModel.patientAssessmentList.isNotEmpty) {
setState(() { widget.medicineViewModel.patientAssessmentList[0].icdCode10ID = widget.prescriptionViewModel.icd10DeseaseItems[index].codeId;
widget.medicineViewModel.patientAssessmentList[0].asciiDesc = widget.prescriptionViewModel.icd10DeseaseItems[index].asciiDesc;
}); }
} icdCodeList.clear();
); setState(() {});
}
}, );
)) :SizedBox() },
]) ))
: SizedBox()
: widget.medicineViewModel.patientAssessmentList.isNotEmpty ? ])
Container( : widget.medicineViewModel.patientAssessmentList.isNotEmpty
height: screenSize.height * 0.068, ? Container(
width: double.infinity, height: screenSize.height * 0.068,
color: Colors.white, width: double.infinity,
child: Row( color: Colors.white,
children: [ child: Row(
Container( children: [
width: MediaQuery.of(context).size.width * 0.29, Container(
child: AppTextFieldCustom( width: MediaQuery.of(context).size.width * 0.29,
hintText: widget.medicineViewModel.patientAssessmentList[0].icdCode10ID.toString(), child: AppTextFieldCustom(
enabled: true, hintText: widget.medicineViewModel.patientAssessmentList[0].icdCode10ID.toString(),
onChanged: (value) {}, enabled: true,
onFieldSubmitted: () {}, onChanged: (value) {},
), onFieldSubmitted: () {},
), ),
Container( ),
width: MediaQuery.of(context).size.width * 0.57, Container(
color: Colors.white, width: MediaQuery.of(context).size.width * 0.57,
child: AppTextFieldCustom( color: Colors.white,
maxLines: 5, child: AppTextFieldCustom(
hintText: widget.medicineViewModel.patientAssessmentList[0].asciiDesc.toString(), maxLines: 5,
enabled: true, hintText: widget.medicineViewModel.patientAssessmentList[0].asciiDesc.toString(),
onChanged: (value) {}, enabled: true,
onFieldSubmitted: () {}, onChanged: (value) {},
), onFieldSubmitted: () {},
), ),
], ),
), ],
) :SizedBox(), ),
)
: SizedBox(),
SizedBox(height: spaceBetweenTextFields), SizedBox(height: spaceBetweenTextFields),
SizedBox(height: 10,), SizedBox(height: 10,),
Container( Container(
@ -523,6 +527,7 @@ getIcdCodeData() async{
} }
addMedicationButton(MedicineViewModel model) async { addMedicationButton(MedicineViewModel model) async {
print("Add");
await locator<AnalyticsService>().logEvent( await locator<AnalyticsService>().logEvent(
eventCategory: "Add Prescription Form", eventCategory: "Add Prescription Form",
eventAction: "Add Prescription", eventAction: "Add Prescription",

Loading…
Cancel
Save