From bd64603e82cae9d32aa8df12f69a652a9c0de955 Mon Sep 17 00:00:00 2001 From: Elham Rababh Date: Mon, 22 Nov 2021 16:27:22 +0200 Subject: [PATCH] 7 step from fix screen --- lib/core/viewModel/SOAP_view_model.dart | 4 +-- .../profile/soap_update/soap_utils.dart | 2 +- .../subjective/medication/add_medication.dart | 35 ++++++++++--------- .../subjective/subjective_call_back.dart | 4 ++- .../subjective/update_subjective_page.dart | 16 ++++----- .../soap_update/update_soap_index.dart | 7 +++- 6 files changed, 38 insertions(+), 30 deletions(-) diff --git a/lib/core/viewModel/SOAP_view_model.dart b/lib/core/viewModel/SOAP_view_model.dart index 0e45825e..028f175d 100644 --- a/lib/core/viewModel/SOAP_view_model.dart +++ b/lib/core/viewModel/SOAP_view_model.dart @@ -804,8 +804,8 @@ class SOAPViewModel extends BaseViewModel { episodeId: patientInfo.episodeNo, appointmentNo: patientInfo.appointmentNo, remarks: "", - historyId: history.selectedHistory.id, - historyType: history.selectedHistory.typeId, + historyId: history.selectedHistory!.id, + historyType: history.selectedHistory!.typeId, isChecked: history.isChecked, )); }); diff --git a/lib/screens/patients/profile/soap_update/soap_utils.dart b/lib/screens/patients/profile/soap_update/soap_utils.dart index 6c5d4f02..5fdf4c93 100644 --- a/lib/screens/patients/profile/soap_update/soap_utils.dart +++ b/lib/screens/patients/profile/soap_update/soap_utils.dart @@ -20,7 +20,7 @@ class SoapUtils { isChecked = false, remark, isLocal = true, - int createdBy, + int ?createdBy, bool isExpanded = false}) { MySelectedAllergy mySelectedAllergy = MySelectedAllergy( selectedAllergy: allergy, diff --git a/lib/screens/patients/profile/soap_update/subjective/medication/add_medication.dart b/lib/screens/patients/profile/soap_update/subjective/medication/add_medication.dart index d2048a62..1b3f9cec 100644 --- a/lib/screens/patients/profile/soap_update/subjective/medication/add_medication.dart +++ b/lib/screens/patients/profile/soap_update/subjective/medication/add_medication.dart @@ -44,7 +44,8 @@ class _AddMedicationState extends State { TextEditingController frequencyController = TextEditingController(); GetMedicationResponseModel? _selectedMedication; - GlobalKey key = new GlobalKey>(); + GlobalKey> key = new GlobalKey>(); + bool isFormSubmitted = false; @override @@ -59,7 +60,7 @@ class _AddMedicationState extends State { baseViewModel: model, isShowAppBar: true, appBar: BottomSheetTitle( - title: TranslationBase.of(context).addMedication, + title: TranslationBase.of(context).addMedication!, ), body: Center( child: Container( @@ -103,8 +104,8 @@ class _AddMedicationState extends State { .textFieldSelectorDecoration( TranslationBase.of( context) - .searchMedicineNameHere, - null, + .searchMedicineNameHere!, + '', true, suffixIcon: Icons.search), @@ -119,22 +120,22 @@ class _AddMedicationState extends State { suggestion) => new Padding( child: AppText(suggestion - .description + + .description! + '/' + - suggestion - .genericName), + suggestion! + .genericName!), padding: EdgeInsets.all( 8.0)), itemSorter: (a, b) => 1, itemFilter: (suggestion, input) => - suggestion.genericName.toLowerCase().startsWith( + suggestion.genericName!.toLowerCase().startsWith( input.toLowerCase()) || - suggestion.description + suggestion.description! .toLowerCase() .startsWith(input .toLowerCase()) || - suggestion.keywords + suggestion.keywords! .toLowerCase() .startsWith(input .toLowerCase()), @@ -145,9 +146,9 @@ class _AddMedicationState extends State { Helpers.getTextFieldHeight(), hintText: _selectedMedication != null - ? _selectedMedication - .description + - (' (${_selectedMedication.genericName} )') + ? _selectedMedication! + .description! + + (' (${_selectedMedication!.genericName!} )') : TranslationBase.of(context) .searchMedicineNameHere, minLines: 1, @@ -157,7 +158,7 @@ class _AddMedicationState extends State { icon: Icon( Icons.search, color: Colors.grey.shade600, - )), + ), onPressed: () { },), enabled: false, ), ), @@ -174,8 +175,8 @@ class _AddMedicationState extends State { .width * 0.7, child: AppText( - _selectedMedication.description + - (' (${_selectedMedication.genericName} )'), + _selectedMedication!.description! + + (' (${_selectedMedication!.genericName!} )'), color: Color(0xFF575757), fontSize: 10, fontWeight: FontWeight.w700, @@ -386,7 +387,7 @@ class _AddMedicationState extends State { _selectedMedicationFrequency != null) { widget.medicationController.text = widget .medicationController.text + - '${_selectedMedication.description} (${TranslationBase.of(context).doseTime} ) ${doseController.text} (${TranslationBase.of(context).strength}) ${strengthController.text} (${TranslationBase.of(context).route}) ${routeController.text} (${TranslationBase.of(context).frequency}) ${frequencyController.text} \n \n'; + '${_selectedMedication!.description!} (${TranslationBase.of(context).doseTime} ) ${doseController.text} (${TranslationBase.of(context).strength}) ${strengthController.text} (${TranslationBase.of(context).route}) ${routeController.text} (${TranslationBase.of(context).frequency}) ${frequencyController.text} \n \n'; Navigator.of(context).pop(); } }, diff --git a/lib/screens/patients/profile/soap_update/subjective/subjective_call_back.dart b/lib/screens/patients/profile/soap_update/subjective/subjective_call_back.dart index e8d0e11f..7bfa44ba 100644 --- a/lib/screens/patients/profile/soap_update/subjective/subjective_call_back.dart +++ b/lib/screens/patients/profile/soap_update/subjective/subjective_call_back.dart @@ -1,3 +1,5 @@ +import 'package:flutter/cupertino.dart'; + abstract class SubjectiveCallBack{ - Function nextFunction(model); + VoidCallback? nextFunction(model); } \ No newline at end of file diff --git a/lib/screens/patients/profile/soap_update/subjective/update_subjective_page.dart b/lib/screens/patients/profile/soap_update/subjective/update_subjective_page.dart index 79417789..6463163a 100644 --- a/lib/screens/patients/profile/soap_update/subjective/update_subjective_page.dart +++ b/lib/screens/patients/profile/soap_update/subjective/update_subjective_page.dart @@ -139,7 +139,7 @@ class _UpdateSubjectivePageState extends State SoapUtils.generateMySelectedAllergy( allergy: selectedAllergy, isChecked: element.isChecked, - createdBy: element.createdBy, + createdBy: element!.createdBy!, remark: element.remarks, isLocal: false, allergySeverity: selectedAllergySeverity); @@ -265,13 +265,13 @@ if (widget.patientInfo.admissionNo == null) ExpandableSOAPWidge } addSubjectiveInfo( - {SOAPViewModel model, - List myAllergiesList, - List myHistoryList}) async { + {required SOAPViewModel model, + required List myAllergiesList, + required List myHistoryList}) async { if (FocusScope.of(context).hasFocus) FocusScope.of(context).unfocus(); widget.changeLoadingState(true); - formKey.currentState.save(); - formKey.currentState.validate(); + formKey.currentState!.save(); + formKey.currentState!.validate(); model.complaintsControllerError = ''; model.medicationControllerError = ''; @@ -315,8 +315,8 @@ if (widget.patientInfo.admissionNo == null) ExpandableSOAPWidge } @override - Function nextFunction(model) { - addSubjectiveInfo( + VoidCallback? nextFunction(model) { + addSubjectiveInfo( model: model, myAllergiesList: myAllergiesList, myHistoryList: myHistoryList); diff --git a/lib/screens/patients/profile/soap_update/update_soap_index.dart b/lib/screens/patients/profile/soap_update/update_soap_index.dart index 707770eb..df245783 100644 --- a/lib/screens/patients/profile/soap_update/update_soap_index.dart +++ b/lib/screens/patients/profile/soap_update/update_soap_index.dart @@ -204,7 +204,7 @@ class _UpdateSoapIndexState extends State with TickerProviderSt Expanded( child: AppButton( title: patient.admissionNo != null && - patient.admissionNo.isNotEmpty && !model.isAddExamInProgress?TranslationBase.of(context).finish: TranslationBase.of(context).next, + patient.admissionNo!.isNotEmpty && !model.isAddExamInProgress?TranslationBase.of(context).finish: TranslationBase.of(context).next, fontWeight: FontWeight.w600, color: Colors.red[700], height: SizeConfig.heightMultiplier * @@ -307,6 +307,11 @@ class _UpdateSoapIndexState extends State with TickerProviderSt ); } break; + default: { + return Container(height: 0,); + } + break; + } } }