Haroon6138
/
doctor_app_flutter
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge branch 'fix-issues' into 'development'

Browse Source 
DA-185

See merge request Cloud_Solution/doctor_app_flutter!330
merge-requests/331/merge
Mohammad Aljammal 4 years ago
parent e03d2c6ab6 bfe73ebe1d
commit 6f46e89346
6 changed files with 66 additions and 49 deletions
Show Stats Download Patch File Download Diff File

9
lib/core/viewModel/medicine_view_model.dart
Unescape Escape View File

@ -167,4 +167,13 @@ class MedicineViewModel extends BaseViewModel {
}
return null;
}
dynamic getLookupByIdFilter(List<dynamic> list, String id) {
for (int i = 0; i < list.length; i++) {
if (list[i]['parameterCode'].toString() == id) {
return list[i];
}
}
return null;
}
}

2
lib/core/viewModel/procedure_View_model.dart
Unescape Escape View File

@ -99,6 +99,6 @@ class ProcedureViewModel extends BaseViewModel {
setState(ViewState.ErrorLocal);
} else
setState(ViewState.Idle);
await getProcedure(mrn: mrn);
//await getProcedure(mrn: mrn);
}
}

83
lib/screens/prescription/update_prescription_form.dart
Unescape Escape View File

@ -79,6 +79,7 @@ class _UpdatePrescriptionFormState extends State<UpdatePrescriptionForm> {
@override
void initState() {
super.initState();
strengthController.text = widget.doseStreangth;
remarksController.text = widget.remarks;
indicationList = List();
@ -121,14 +122,16 @@ class _UpdatePrescriptionFormState extends State<UpdatePrescriptionForm> {
await model.getMedicationRoute();
await model.getMedicationFrequency();
await model.getMedicationDoseTime();
await model.getItem(itemID: widget.drugId);
//await model.getMedicationIndications();
route = model.getLookupById(model.medicationRouteList, widget.route);
route = model.getLookupByIdFilter(
model.itemMedicineListRoute, widget.route);
doseTime =
model.getLookupById(model.medicationDoseTimeList, widget.dose);
model.getLookupByIdFilter(model.itemMedicineList, widget.dose);
updatedDuration = model.getLookupById(
model.medicationDurationList, widget.duration);
units = model.getLookupById(
model.medicationStrengthList, widget.doseUnit);
units = model.getLookupByIdFilter(
model.itemMedicineListUnit, widget.doseUnit);
frequencyUpdate = model.getLookupById(
model.medicationFrequencyList, widget.frequency);
},
@ -298,7 +301,7 @@ class _UpdatePrescriptionFormState extends State<UpdatePrescriptionForm> {
0.3700,
child: InkWell(
onTap:
model.medicationStrengthList !=
model.itemMedicineListUnit !=
null
? () {
Helpers.hideKeyboard(
@ -307,11 +310,11 @@ class _UpdatePrescriptionFormState extends State<UpdatePrescriptionForm> {
dialog =
ListSelectDialog(
list: model
.medicationStrengthList,
.itemMedicineListUnit,
attributeName:
'nameEn',
'description',
attributeValueId:
'id',
'parameterCode',
okText:
TranslationBase.of(
context)
@ -341,7 +344,8 @@ class _UpdatePrescriptionFormState extends State<UpdatePrescriptionForm> {
textFieldSelectorDecoration(
'UNIT Type',
units != null
? units['nameEn']
? units[
'description']
: null,
true),
enabled: false,
@ -359,15 +363,17 @@ class _UpdatePrescriptionFormState extends State<UpdatePrescriptionForm> {
MediaQuery.of(context).size.height *
0.070,
child: InkWell(
onTap: model.medicationRouteList != null
onTap: model.itemMedicineListRoute !=
null
? () {
Helpers.hideKeyboard(context);
ListSelectDialog dialog =
ListSelectDialog(
list:
model.medicationRouteList,
attributeName: 'nameEn',
attributeValueId: 'id',
list: model
.itemMedicineListRoute,
attributeName: 'description',
attributeValueId:
'parameterCode',
okText: TranslationBase.of(
context)
.ok,
@ -395,7 +401,7 @@ class _UpdatePrescriptionFormState extends State<UpdatePrescriptionForm> {
textFieldSelectorDecoration(
'Route',
route != null
? route['nameEn']
? route['description']
: null,
true),
enabled: false,
@ -410,16 +416,15 @@ class _UpdatePrescriptionFormState extends State<UpdatePrescriptionForm> {
MediaQuery.of(context).size.height *
0.070,
child: InkWell(
onTap: model.medicationDoseTimeList !=
null
onTap: model.itemMedicineList != null
? () {
Helpers.hideKeyboard(context);
ListSelectDialog dialog =
ListSelectDialog(
list: model
.medicationDoseTimeList,
attributeName: 'nameEn',
attributeValueId: 'id',
list: model.itemMedicineList,
attributeName: 'description',
attributeValueId:
'parameterCode',
okText: TranslationBase.of(
context)
.ok,
@ -445,7 +450,7 @@ class _UpdatePrescriptionFormState extends State<UpdatePrescriptionForm> {
TranslationBase.of(context)
.doseTime,
doseTime != null
? doseTime['nameEn']
? doseTime['description']
: null,
true),
enabled: false,
@ -735,7 +740,8 @@ class _UpdatePrescriptionFormState extends State<UpdatePrescriptionForm> {
: widget
.doseStreangth,
newUnit: units != null
? units['id'].toString()
? units['parameterCode']
.toString()
: widget.doseUnit,
doseUnit: widget.doseUnit,
doseStreangth:
@ -747,24 +753,27 @@ class _UpdatePrescriptionFormState extends State<UpdatePrescriptionForm> {
routeId: widget.route,
patient: widget.patient,
model: widget.model,
newDuration: updatedDuration !=
null
? updatedDuration['id']
.toString()
: widget.duration,
newDuration:
updatedDuration != null
? updatedDuration['id']
.toString()
: widget.duration,
drugId: widget.drugId,
remarks:
remarksController.text,
remarks: remarksController
.text,
route: route != null
? route['id'].toString()
: widget.route,
frequency: frequencyUpdate !=
null
? frequencyUpdate['id']
? route[
'parameterCode']
.toString()
: widget.frequency,
: widget.route,
frequency:
frequencyUpdate !=
null
? frequencyUpdate['id']
.toString()
: widget.frequency,
dose: doseTime != null
? doseTime['id']
? doseTime['parameterCode']
.toString()
: widget.dose,
enteredRemarks:

5
lib/screens/procedures/entity_list_checkbox_search_widget.dart
Unescape Escape View File

@ -41,6 +41,9 @@ class EntityListCheckboxSearchWidget extends StatefulWidget {
class _EntityListCheckboxSearchWidgetState
extends State<EntityListCheckboxSearchWidget> {
int selectedType = 1;
int typeUrgent;
int typeRegular;
setSelectedType(int val) {
setState(() {
selectedType = val;
@ -136,6 +139,7 @@ class _EntityListCheckboxSearchWidgetState
historyInfo.type =
setSelectedType(value)
.toString();
historyInfo.type =
value.toString();
},
@ -149,6 +153,7 @@ class _EntityListCheckboxSearchWidgetState
historyInfo.type =
setSelectedType(value)
.toString();
historyInfo.type =
value.toString();
},

14
lib/screens/procedures/update-procedure.dart
Unescape Escape View File

@ -324,17 +324,11 @@ class _UpdateProcedureWidgetState extends State<UpdateProcedureWidget> {
controls.add(
Controls(code: "ordertype", controlValue: '1'),
);
});
entityList.isNotEmpty
? entityList.forEach((element) {
controlsProcedure.procedure = element.procedureId;
controlsProcedure.category = "0" + element.categoryID;
controlsProcedure.controls = controls;
})
: controlsProcedure.procedure = procedureId;
controlsProcedure.category = categorieId;
controlsProcedure.controls = controls;
controlsProcedure.procedure = element.procedureId;
controlsProcedure.category = element.categoryID;
controlsProcedure.controls = controls;
});
// controlsProcedure.add(ProcedureDetail(
// category: categorieId, procedure: procedureId, controls: controls));
updateProcedureReqModel.procedureDetail = controlsProcedure;

2
lib/util/dr_app_toast_msg.dart
Unescape Escape View File

@ -29,7 +29,7 @@ class DrAppToastMsg {
icon: ICON.CLOSE,
fontSize: 16,
imageSize: 35,
timeInSeconds: 9000,
timeInSeconds: 912,
textColor: Colors.white);
}

Write Preview
Loading…
Cancel
Save