Merge branches 'development' and 'fix_issues' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_issues

 Conflicts:
	lib/config/localized_values.dart
	lib/util/translations_delegate_base.dart
merge-requests/275/head
Elham Rababah 5 years ago
commit 7db8a42adc

@ -49,7 +49,7 @@ const Map<String, Map<String, String>> localizedValues = {
'patientServices': {'en': 'Patient Services', 'ar': 'خدمات المرضى'}, 'patientServices': {'en': 'Patient Services', 'ar': 'خدمات المرضى'},
'searchMedicine': {'en': 'Search Medicine', 'ar': 'بحث عن الدواء'}, 'searchMedicine': {'en': 'Search Medicine', 'ar': 'بحث عن الدواء'},
'myReferralPatient': {'en': 'My Referral Patient', 'ar': 'مرضى الاحالة'}, 'myReferralPatient': {'en': 'My Referral Patient', 'ar': 'مرضى الاحالة'},
'referPatient': {'en': 'Refer Patient', 'ar': 'إحالة مريض'}, 'referPatient': {'en': 'Referral Patient', 'ar': 'إحالة مريض'},
'myReferral': {'en': 'My Referral', 'ar': 'إحالة'}, 'myReferral': {'en': 'My Referral', 'ar': 'إحالة'},
'myReferredPatient': {'en': 'My Referred Patient', 'ar': 'مرضاي المحالين'}, 'myReferredPatient': {'en': 'My Referred Patient', 'ar': 'مرضاي المحالين'},
'firstName': {'en': 'First Name', 'ar': 'الاسم الاول'}, 'firstName': {'en': 'First Name', 'ar': 'الاسم الاول'},
@ -666,6 +666,14 @@ const Map<String, Map<String, String>> localizedValues = {
'en': "You have to add chief complaint fields correctly .", 'en': "You have to add chief complaint fields correctly .",
'ar': "يجب عليك إضافة حقول شكوى الرئيس بشكل صحيح" 'ar': "يجب عليك إضافة حقول شكوى الرئيس بشكل صحيح"
}, },
'referralStatus': {
'en': "Referral Status : ",
'ar': "حالة الإحالة :"
},
'referralRemark': {
'en': "Referral Remark : ",
'ar': "ملاحظة الإحالة :"
},
'ICDName': { 'ICDName': {
'en': "ICDName", 'en': "ICDName",
'ar': "اسم ال ICD" 'ar': "اسم ال ICD"

@ -131,7 +131,7 @@ class PatientReferralViewModel extends BaseViewModel {
await _referralPatientService.responseReferral(pendingReferral, isAccepted); await _referralPatientService.responseReferral(pendingReferral, isAccepted);
if (_referralPatientService.hasError) { if (_referralPatientService.hasError) {
error = _referralPatientService.error; error = _referralPatientService.error;
setState(ViewState.Error); setState(ViewState.ErrorLocal);
} else } else
setState(ViewState.Idle); setState(ViewState.Idle);
} }

@ -6,6 +6,7 @@ import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart';
import 'package:doctor_app_flutter/models/patient/vital_sign/patient-vital-sign-data.dart'; import 'package:doctor_app_flutter/models/patient/vital_sign/patient-vital-sign-data.dart';
import 'package:doctor_app_flutter/models/patient/vital_sign/patient-vital-sign-history.dart'; import 'package:doctor_app_flutter/models/patient/vital_sign/patient-vital-sign-history.dart';
import 'package:doctor_app_flutter/models/patient/vital_sign/vital_sign_res_model.dart'; import 'package:doctor_app_flutter/models/patient/vital_sign/vital_sign_res_model.dart';
import 'package:doctor_app_flutter/util/date-utils.dart';
import '../../locator.dart'; import '../../locator.dart';
@ -13,7 +14,9 @@ class VitalSignsViewModel extends BaseViewModel {
VitalSignsService _vitalSignService = locator<VitalSignsService>(); VitalSignsService _vitalSignService = locator<VitalSignsService>();
VitalSignData get patientVitalSigns => _vitalSignService.patientVitalSigns; VitalSignData get patientVitalSigns => _vitalSignService.patientVitalSigns;
List<VitalSignHistory> get patientVitalSignsHistory => _vitalSignService.patientVitalSignsHistory;
List<VitalSignHistory> get patientVitalSignsHistory =>
_vitalSignService.patientVitalSignsHistory;
String heightCm = "0"; String heightCm = "0";
String weightKg = "0"; String weightKg = "0";
@ -34,8 +37,16 @@ class VitalSignsViewModel extends BaseViewModel {
} }
} }
Future getPatientVitalSignHistory(PatiantInformtion patient, String from, String to) async { Future getPatientVitalSignHistory(
PatiantInformtion patient, String from, String to) async {
setState(ViewState.Busy); setState(ViewState.Busy);
if (from == null || from == "0") {
from = DateUtils.convertDateToFormat(DateTime.now(), 'yyyy-MM-dd');
}
if (to == null || to == "0") {
to = DateUtils.convertDateToFormat(DateTime.now(), 'yyyy-MM-dd');
}
await _vitalSignService.getPatientVitalSignsHistory(patient, from, to); await _vitalSignService.getPatientVitalSignsHistory(patient, from, to);
if (_vitalSignService.hasError) { if (_vitalSignService.hasError) {
error = _vitalSignService.error; error = _vitalSignService.error;
@ -48,9 +59,7 @@ class VitalSignsViewModel extends BaseViewModel {
if (weightKg == "0" || weightKg == null || weightKg == 'null') { if (weightKg == "0" || weightKg == null || weightKg == 'null') {
weightKg = element.weightKg.toString(); weightKg = element.weightKg.toString();
} }
if (bodyMax == "0" || if (bodyMax == "0" || bodyMax == null || bodyMax == 'null') {
bodyMax == null ||
bodyMax == 'null') {
bodyMax = element.bodyMassIndex.toString(); bodyMax = element.bodyMassIndex.toString();
} }
if (temperatureCelcius == "0" || if (temperatureCelcius == "0" ||
@ -84,24 +93,24 @@ class VitalSignsViewModel extends BaseViewModel {
return "Normal"; return "Normal";
} else if (bodyMassIndex <= 30) { } else if (bodyMassIndex <= 30) {
return "Overweight"; return "Overweight";
} else { // > 30.0 } else {
// > 30.0
return "Obese"; return "Obese";
} }
} }
String getTempratureMethod(int temperatureCelciusMethod){ String getTempratureMethod(int temperatureCelciusMethod) {
// temperatureCelciusMethod ( vital sign response field )- master 2005 // temperatureCelciusMethod ( vital sign response field )- master 2005
if(temperatureCelciusMethod == 1){ if (temperatureCelciusMethod == 1) {
return "Oral"; return "Oral";
} else if(temperatureCelciusMethod == 2){ } else if (temperatureCelciusMethod == 2) {
return "Axilla"; return "Axilla";
} else if(temperatureCelciusMethod == 3){ } else if (temperatureCelciusMethod == 3) {
return "Rectal"; return "Rectal";
} else if(temperatureCelciusMethod == 4){ } else if (temperatureCelciusMethod == 4) {
return "Tympanic"; return "Tympanic";
} else if(temperatureCelciusMethod == 5){ } else if (temperatureCelciusMethod == 5) {
return "Temporal"; return "Temporal";
} }
} }
} }

@ -41,97 +41,109 @@ class _MedicalFilePageState extends State<MedicalFilePage> {
thickness: 1.0, thickness: 1.0,
color: Colors.grey, color: Colors.grey,
), ),
if (model.medicalFileList.length != 0) (model.medicalFileList.length != 0 &&
ListView.builder( model.medicalFileList != null)
//physics: , ? ListView.builder(
physics: NeverScrollableScrollPhysics(), //physics: ,
scrollDirection: Axis.vertical, physics: NeverScrollableScrollPhysics(),
shrinkWrap: true, scrollDirection: Axis.vertical,
itemCount: model shrinkWrap: true,
.medicalFileList[0].entityList[0].timelines.length, itemCount: model.medicalFileList[0].entityList[0]
itemBuilder: (BuildContext ctxt, int index) { .timelines.length,
return Padding( itemBuilder: (BuildContext ctxt, int index) {
padding: EdgeInsets.symmetric( return Padding(
horizontal: 12.0, vertical: 8.0), padding: EdgeInsets.symmetric(
child: InkWell( horizontal: 12.0, vertical: 8.0),
child: Container( child: InkWell(
child: Column( child: Container(
children: [ child: Column(
Row( children: [
children: [ Row(
AppText( children: [
TranslationBase.of(context).branch + AppText(
": ", TranslationBase.of(context).branch +
fontWeight: FontWeight.w700, ": ",
), fontWeight: FontWeight.w700,
AppText(model ),
.medicalFileList[0] AppText(model
.entityList[0] .medicalFileList[0]
.timelines[index] .entityList[0]
.projectName), .timelines[index]
], .projectName),
), ],
Row( ),
children: [ Row(
AppText( children: [
TranslationBase.of(context) AppText(
.doctorName TranslationBase.of(context)
.toUpperCase() + .doctorName
": ", .toUpperCase() +
fontWeight: FontWeight.w700, ": ",
), fontWeight: FontWeight.w700,
Expanded( ),
child: AppText( Expanded(
child: AppText(
model
.medicalFileList[0]
.entityList[0]
.timelines[index]
.doctorName,
fontWeight: FontWeight.w700,
),
),
],
),
Row(
children: [
AppText(
TranslationBase.of(context)
.clinicName +
": ",
fontWeight: FontWeight.w700,
),
AppText(
model model
.medicalFileList[0] .medicalFileList[0]
.entityList[0] .entityList[0]
.timelines[index] .timelines[index]
.doctorName, .clinicName,
fontWeight: FontWeight.w700,
), ),
), ],
], ),
), SizedBox(height: 10.0),
Row( Divider(
children: [ height: 1.0,
AppText( thickness: 1.0,
TranslationBase.of(context) color: Colors.grey.shade400,
.clinicName + )
": ", ],
fontWeight: FontWeight.w700, ),
),
AppText(
model.medicalFileList[0].entityList[0]
.timelines[index].clinicName,
),
],
),
SizedBox(height: 10.0),
Divider(
height: 1.0,
thickness: 1.0,
color: Colors.grey.shade400,
)
],
), ),
onTap: () {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) =>
MedicalFileDetails(
age: patient.age,
firstName: patient.firstName,
lastName: patient.lastName,
gender: patient.genderDescription,
encounterNumber: index,
pp: patient.patientMRN,
)),
);
},
), ),
onTap: () { );
Navigator.push( })
context, : Center(
MaterialPageRoute( child: Container(
builder: (context) => MedicalFileDetails( child: AppText(
age: patient.age, 'THERES NO MEDICAL FILE FOR THIS Patient',
firstName: patient.firstName,
lastName: patient.lastName,
gender: patient.genderDescription,
encounterNumber: index,
pp: patient.patientMRN,
)),
);
},
), ),
); ),
}) )
], ],
), ),
), ),

@ -1,9 +1,11 @@
import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/config/size_config.dart';
import 'package:doctor_app_flutter/core/enum/viewstate.dart';
import 'package:doctor_app_flutter/core/viewModel/auth_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/auth_view_model.dart';
import 'package:doctor_app_flutter/core/viewModel/patient-referral-viewmodel.dart'; import 'package:doctor_app_flutter/core/viewModel/patient-referral-viewmodel.dart';
import 'package:doctor_app_flutter/models/patient/my_referral/PendingReferral.dart'; import 'package:doctor_app_flutter/models/patient/my_referral/PendingReferral.dart';
import 'package:doctor_app_flutter/screens/base/base_view.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart';
import 'package:doctor_app_flutter/util/date-utils.dart'; import 'package:doctor_app_flutter/util/date-utils.dart';
import 'package:doctor_app_flutter/util/dr_app_toast_msg.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/patients/patient-referral-item-widget.dart'; import 'package:doctor_app_flutter/widgets/patients/patient-referral-item-widget.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/PatientProfileButton.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/PatientProfileButton.dart';
@ -144,8 +146,11 @@ class MyReferralDetailScreen extends StatelessWidget {
fontSize: 16, fontSize: 16,
hPadding: 8, hPadding: 8,
vPadding: 12, vPadding: 12,
handler: () { handler: () async {
model.responseReferral(pendingReferral, true); await model.responseReferral(pendingReferral, true);
if(model.state == ViewState.ErrorLocal){
DrAppToastMsg.showErrorToast(model.error);
}
}, },
), ),
), ),
@ -160,8 +165,11 @@ class MyReferralDetailScreen extends StatelessWidget {
fontSize: 16, fontSize: 16,
hPadding: 8, hPadding: 8,
vPadding: 12, vPadding: 12,
handler: () { handler: () async {
model.responseReferral(pendingReferral, false); await model.responseReferral(pendingReferral, true);
if(model.state == ViewState.ErrorLocal){
DrAppToastMsg.showErrorToast(model.error);
}
}, },
), ),
), ),

@ -22,6 +22,7 @@ import 'package:doctor_app_flutter/widgets/shared/dialogs/dailog-list-select.dar
import 'package:doctor_app_flutter/widgets/shared/network_base_view.dart'; import 'package:doctor_app_flutter/widgets/shared/network_base_view.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:hexcolor/hexcolor.dart'; import 'package:hexcolor/hexcolor.dart';
import 'package:flutter/services.dart';
addPrescriptionForm(context, PrescriptionViewModel model, addPrescriptionForm(context, PrescriptionViewModel model,
PatiantInformtion patient, prescription) { PatiantInformtion patient, prescription) {
@ -101,6 +102,7 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
TextEditingController instructionController = TextEditingController(); TextEditingController instructionController = TextEditingController();
DateTime selectedDate; DateTime selectedDate;
dynamic selectedDrug; dynamic selectedDrug;
int strengthChar;
GetMedicationResponseModel _selectedMedication; GetMedicationResponseModel _selectedMedication;
GlobalKey key = GlobalKey key =
new GlobalKey<AutoCompleteTextFieldState<GetMedicationResponseModel>>(); new GlobalKey<AutoCompleteTextFieldState<GetMedicationResponseModel>>();
@ -525,21 +527,33 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
Container( Container(
width: width:
MediaQuery.of(context).size.width * MediaQuery.of(context).size.width *
0.650, 0.550,
child: TextFields( child: TextFields(
inputFormatters: [
LengthLimitingTextInputFormatter(4)
],
hintText: TranslationBase.of(context) hintText: TranslationBase.of(context)
.strength, .strength,
controller: strengthController, controller: strengthController,
keyboardType: TextInputType.number, keyboardType: TextInputType.number,
validator: (value) { onChanged: (String value) {
if (value.isEmpty && setState(() {
strengthController.text.length > strengthChar = value.length;
4) });
return TranslationBase.of(context) if (strengthChar >= 4) {
.emptyMessage; DrAppToastMsg.showErrorToast(
else "Only 4 Digits allowed for strength");
return null; }
}, },
// validator: (value) {
// if (value.isEmpty &&
// strengthController.text.length >
// 4)
// return TranslationBase.of(context)
// .emptyMessage;
// else
// return null;
// },
), ),
), ),
SizedBox( SizedBox(
@ -548,7 +562,7 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
Container( Container(
width: width:
MediaQuery.of(context).size.width * MediaQuery.of(context).size.width *
0.250, 0.350,
child: InkWell( child: InkWell(
onTap: unitsList != null onTap: unitsList != null
? () { ? () {

@ -22,6 +22,7 @@ import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/dialogs/dailog-list-select.dart'; import 'package:doctor_app_flutter/widgets/shared/dialogs/dailog-list-select.dart';
import 'package:doctor_app_flutter/widgets/shared/network_base_view.dart'; import 'package:doctor_app_flutter/widgets/shared/network_base_view.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:hexcolor/hexcolor.dart'; import 'package:hexcolor/hexcolor.dart';
class NewPrescriptionScreen extends StatefulWidget { class NewPrescriptionScreen extends StatefulWidget {
@ -32,15 +33,21 @@ class NewPrescriptionScreen extends StatefulWidget {
class _NewPrescriptionScreenState extends State<NewPrescriptionScreen> { class _NewPrescriptionScreenState extends State<NewPrescriptionScreen> {
PersistentBottomSheetController _controller; PersistentBottomSheetController _controller;
final _scaffoldKey = GlobalKey<ScaffoldState>(); final _scaffoldKey = GlobalKey<ScaffoldState>();
TextEditingController strengthController = TextEditingController();
int testNum = 0; int testNum = 0;
int strengthChar;
PatiantInformtion patient; PatiantInformtion patient;
dynamic route; dynamic route;
dynamic doseTime; dynamic doseTime;
dynamic frequencyUpdate; dynamic frequencyUpdate;
dynamic updatedDuration;
dynamic units;
List<dynamic> doseTimeList; List<dynamic> doseTimeList;
List<dynamic> routeList; List<dynamic> routeList;
List<dynamic> frequencyList; List<dynamic> frequencyList;
List<dynamic> durationList;
List<dynamic> unitsList;
@override @override
void initState() { void initState() {
@ -48,7 +55,12 @@ class _NewPrescriptionScreenState extends State<NewPrescriptionScreen> {
routeList = List(); routeList = List();
doseTimeList = List(); doseTimeList = List();
frequencyList = List(); frequencyList = List();
durationList = List();
unitsList = List();
dynamic unit1 = {"id": 1, "name": "MG"};
dynamic unit2 = {"id": 2, "name": "MCG"};
dynamic unit3 = {"id": 3, "name": "GM"};
dynamic frequency1 = {"id": 2, "name": "2 Times a day"}; dynamic frequency1 = {"id": 2, "name": "2 Times a day"};
dynamic frequency2 = {"id": 3, "name": "3 Times a day"}; dynamic frequency2 = {"id": 3, "name": "3 Times a day"};
dynamic frequency3 = {"id": 4, "name": "4 Times a day"}; dynamic frequency3 = {"id": 4, "name": "4 Times a day"};
@ -115,7 +127,39 @@ class _NewPrescriptionScreenState extends State<NewPrescriptionScreen> {
dynamic route25 = {"id": 37, "name": "Inserted into Vagina"}; dynamic route25 = {"id": 37, "name": "Inserted into Vagina"};
dynamic route26 = {"id": 36, "name": "Inserted into Rectum"}; dynamic route26 = {"id": 36, "name": "Inserted into Rectum"};
dynamic route27 = {"id": 31, "name": "In Each Nostril"}; dynamic route27 = {"id": 31, "name": "In Each Nostril"};
dynamic duration1 = {"id": 1, "name": "For 1 Day"};
dynamic duration2 = {"id": 2, "name": "For 2 Days"};
dynamic duration3 = {"id": 3, "name": "For 3 Days"};
dynamic duration4 = {"id": 4, "name": "For 4 Days"};
dynamic duration5 = {"id": 5, "name": "For 5 Days"};
dynamic duration6 = {"id": 6, "name": "For 6 Days"};
dynamic duration7 = {"id": 7, "name": "For 7 Days"};
dynamic duration8 = {"id": 8, "name": "For 8 Days"};
dynamic duration9 = {"id": 9, "name": "For 9 Days"};
dynamic duration10 = {"id": 10, "name": "For 10 Days"};
dynamic duration11 = {"id": 14, "name": "For 14 Days"};
dynamic duration12 = {"id": 21, "name": "For 21 Days"};
dynamic duration13 = {"id": 30, "name": "For 30 Days"};
dynamic duration14 = {"id": 45, "name": "For 45 Days"};
dynamic duration15 = {"id": 60, "name": "For 60 Days"};
dynamic duration16 = {"id": 90, "name": "For 90 Days"};
durationList.add(duration1);
durationList.add(duration2);
durationList.add(duration3);
durationList.add(duration4);
durationList.add(duration5);
durationList.add(duration6);
durationList.add(duration7);
durationList.add(duration8);
durationList.add(duration9);
durationList.add(duration10);
durationList.add(duration11);
durationList.add(duration12);
durationList.add(duration13);
durationList.add(duration14);
durationList.add(duration15);
durationList.add(duration16);
frequencyList.add(frequency1); frequencyList.add(frequency1);
frequencyList.add(frequency2); frequencyList.add(frequency2);
frequencyList.add(frequency3); frequencyList.add(frequency3);
@ -182,6 +226,9 @@ class _NewPrescriptionScreenState extends State<NewPrescriptionScreen> {
routeList.add(route25); routeList.add(route25);
routeList.add(route26); routeList.add(route26);
routeList.add(route27); routeList.add(route27);
unitsList.add(unit1);
unitsList.add(unit2);
unitsList.add(unit3);
} }
Widget build(BuildContext context) { Widget build(BuildContext context) {
@ -442,7 +489,7 @@ class _NewPrescriptionScreenState extends State<NewPrescriptionScreen> {
context) context)
.size .size
.height * .height *
0.282, 0.295,
width: MediaQuery.of( width: MediaQuery.of(
context) context)
.size .size
@ -582,13 +629,18 @@ class _NewPrescriptionScreenState extends State<NewPrescriptionScreen> {
children: [ children: [
Expanded( Expanded(
child: child:
AppText( Container(
model height:
.prescriptionList[0] 30,
.entityList[index] child:
.remarks, AppText(
fontSize: model
14.0, .prescriptionList[0]
.entityList[index]
.remarks,
fontSize:
11.5,
),
), ),
), ),
], ],
@ -792,213 +844,389 @@ class _NewPrescriptionScreenState extends State<NewPrescriptionScreen> {
builder: (BuildContext context) { builder: (BuildContext context) {
return StatefulBuilder(builder: (BuildContext context, return StatefulBuilder(builder: (BuildContext context,
StateSetter setState /*You can rename this!*/) { StateSetter setState /*You can rename this!*/) {
return Container( return DraggableScrollableSheet(
height: MediaQuery.of(context).size.height * 0.73, initialChildSize: 0.90,
child: Form( maxChildSize: 0.90,
child: Padding( minChildSize: 0.6,
padding: builder:
EdgeInsets.symmetric(horizontal: 20.0, vertical: 12.0), (BuildContext context, ScrollController scrollController) {
child: Column( return Container(
crossAxisAlignment: CrossAxisAlignment.start, height: MediaQuery.of(context).size.height * 1.0,
children: [ child: Form(
AppText( child: Padding(
drugName.toUpperCase(), padding: EdgeInsets.symmetric(
fontWeight: FontWeight.w900, horizontal: 20.0, vertical: 12.0),
), child: Column(
SizedBox( crossAxisAlignment: CrossAxisAlignment.start,
height: 30.0, children: [
), AppText(
Column( drugName.toUpperCase(),
children: [ fontWeight: FontWeight.w900,
Container(
height:
MediaQuery.of(context).size.height * 0.070,
child: InkWell(
onTap: routeList != null
? () {
ListSelectDialog dialog =
ListSelectDialog(
list: routeList,
attributeName: 'name',
attributeValueId: 'id',
okText:
TranslationBase.of(context).ok,
okFunction: (selectedValue) {
setState(() {
route = selectedValue;
});
if (route == null) {
route = route['id'];
}
},
);
showDialog(
barrierDismissible: false,
context: context,
builder: (BuildContext context) {
return dialog;
},
);
}
: null,
child: TextField(
decoration: textFieldSelectorDecoration(
TranslationBase.of(context).route,
route != null ? route['name'] : null,
true),
enabled: false,
),
), ),
), SizedBox(
SizedBox( height: 10.0,
height: 12.0,
),
Container(
height:
MediaQuery.of(context).size.height * 0.070,
child: InkWell(
onTap: doseTimeList != null
? () {
ListSelectDialog dialog =
ListSelectDialog(
list: doseTimeList,
attributeName: 'name',
attributeValueId: 'id',
okText:
TranslationBase.of(context).ok,
okFunction: (selectedValue) {
setState(() {
doseTime = selectedValue;
});
},
);
showDialog(
barrierDismissible: false,
context: context,
builder: (BuildContext context) {
return dialog;
},
);
}
: null,
child: TextField(
decoration: textFieldSelectorDecoration(
TranslationBase.of(context).doseTime,
doseTime != null
? doseTime['name']
: null,
true),
enabled: false,
),
), ),
), Column(
SizedBox( children: [
height: 12.0, Container(
), height: MediaQuery.of(context).size.height *
Container( 0.070,
height: width: double.infinity,
MediaQuery.of(context).size.height * 0.070, child: Row(
child: InkWell( children: [
onTap: frequencyList != null Container(
? () { width: MediaQuery.of(context)
ListSelectDialog dialog = .size
ListSelectDialog( .width *
list: frequencyList, 0.550,
attributeName: 'name', child: TextFields(
attributeValueId: 'id', inputFormatters: [
okText: LengthLimitingTextInputFormatter(
TranslationBase.of(context).ok, 4)
okFunction: (selectedValue) { ],
setState(() { hintText:
frequencyUpdate = selectedValue; TranslationBase.of(context)
}); .strength,
}, controller: strengthController,
); keyboardType: TextInputType.number,
showDialog( onChanged: (String value) {
barrierDismissible: false, setState(() {
context: context, strengthChar = value.length;
builder: (BuildContext context) { });
return dialog; if (strengthChar >= 4) {
}, DrAppToastMsg.showErrorToast(
); "Only 4 Digits allowed for strength");
} }
: null, },
child: TextField( // validator: (value) {
decoration: textFieldSelectorDecoration( // if (value.isEmpty &&
TranslationBase.of(context).frequency, // strengthController.text.length >
frequencyUpdate != null // 4)
? frequencyUpdate['name'] // return TranslationBase.of(context)
// .emptyMessage;
// else
// return null;
// },
),
),
SizedBox(
width: 10.0,
),
Container(
width: MediaQuery.of(context)
.size
.width *
0.3200,
child: InkWell(
onTap: unitsList != null
? () {
ListSelectDialog dialog =
ListSelectDialog(
list: unitsList,
attributeName: 'name',
attributeValueId: 'id',
okText:
TranslationBase.of(
context)
.ok,
okFunction:
(selectedValue) {
setState(() {
units = selectedValue;
});
},
);
showDialog(
barrierDismissible: false,
context: context,
builder: (BuildContext
context) {
return dialog;
},
);
}
: null,
child: TextField(
decoration:
textFieldSelectorDecoration(
'UNIT Type',
units != null
? units['name']
: null,
true),
enabled: false,
),
),
),
],
),
),
Container(
height: MediaQuery.of(context).size.height *
0.070,
child: InkWell(
onTap: routeList != null
? () {
ListSelectDialog dialog =
ListSelectDialog(
list: routeList,
attributeName: 'name',
attributeValueId: 'id',
okText:
TranslationBase.of(context)
.ok,
okFunction: (selectedValue) {
setState(() {
route = selectedValue;
});
if (route == null) {
route = route['id'];
}
},
);
showDialog(
barrierDismissible: false,
context: context,
builder:
(BuildContext context) {
return dialog;
},
);
}
: null, : null,
true), child: TextField(
enabled: false, decoration: textFieldSelectorDecoration(
), TranslationBase.of(context).route,
), route != null
), ? route['name']
SizedBox( : null,
height: 12.0, true),
), enabled: false,
Container( ),
decoration: BoxDecoration( ),
borderRadius: ),
BorderRadius.all(Radius.circular(6.0)), SizedBox(
border: Border.all( height: 12.0,
width: 1.0, color: HexColor("#CCCCCC"))), ),
child: TextFields( Container(
hintText: remarks, height: MediaQuery.of(context).size.height *
controller: remarksController, 0.070,
maxLines: 7, child: InkWell(
minLines: 4, onTap: doseTimeList != null
), ? () {
), ListSelectDialog dialog =
SizedBox( ListSelectDialog(
height: 12.0, list: doseTimeList,
), attributeName: 'name',
SizedBox( attributeValueId: 'id',
height: MediaQuery.of(context).size.height * 0.12, okText:
), TranslationBase.of(context)
Container( .ok,
margin: EdgeInsets.all( okFunction: (selectedValue) {
SizeConfig.widthMultiplier * 2), setState(() {
child: Wrap( doseTime = selectedValue;
alignment: WrapAlignment.center, });
children: <Widget>[ },
AppButton( );
title: 'update prescription'.toUpperCase(), showDialog(
onPressed: () { barrierDismissible: false,
updatePrescription( context: context,
doseUnit: doseUnit, builder:
doseStreangth: doseStreangth, (BuildContext context) {
duration: duration, return dialog;
startDate: startDate, },
doseId: dose, );
frequencyId: frequency, }
routeId: rouat, : null,
patient: patient, child: TextField(
model: model, decoration: textFieldSelectorDecoration(
drugId: drugId, TranslationBase.of(context)
remarks: remarksController.text, .doseTime,
route: route != null doseTime != null
? route['id'].toString() ? doseTime['name']
: rouat, : null,
frequency: frequencyUpdate != null true),
? frequencyUpdate['id'].toString() enabled: false,
: frequency, ),
dose: doseTime != null ),
? doseTime['id'].toString() ),
: dose, SizedBox(
enteredRemarks: enteredRemarks); height: 12.0,
Navigator.pop(context); ),
}, Container(
height: MediaQuery.of(context).size.height *
0.070,
child: InkWell(
onTap: frequencyList != null
? () {
ListSelectDialog dialog =
ListSelectDialog(
list: frequencyList,
attributeName: 'name',
attributeValueId: 'id',
okText:
TranslationBase.of(context)
.ok,
okFunction: (selectedValue) {
setState(() {
frequencyUpdate =
selectedValue;
});
},
);
showDialog(
barrierDismissible: false,
context: context,
builder:
(BuildContext context) {
return dialog;
},
);
}
: null,
child: TextField(
decoration: textFieldSelectorDecoration(
TranslationBase.of(context)
.frequency,
frequencyUpdate != null
? frequencyUpdate['name']
: null,
true),
enabled: false,
),
),
),
SizedBox(
height: 12.0,
),
Container(
height: MediaQuery.of(context).size.height *
0.070,
child: InkWell(
onTap: durationList != null
? () {
ListSelectDialog dialog =
ListSelectDialog(
list: durationList,
attributeName: 'name',
attributeValueId: 'id',
okText:
TranslationBase.of(context)
.ok,
okFunction: (selectedValue) {
setState(() {
updatedDuration =
selectedValue;
});
},
);
showDialog(
barrierDismissible: false,
context: context,
builder:
(BuildContext context) {
return dialog;
},
);
}
: null,
child: TextField(
decoration: textFieldSelectorDecoration(
TranslationBase.of(context)
.duration,
updatedDuration != null
? updatedDuration['name']
.toString()
: null,
true),
enabled: false,
),
),
),
SizedBox(
height: 12.0,
),
Container(
decoration: BoxDecoration(
borderRadius: BorderRadius.all(
Radius.circular(6.0)),
border: Border.all(
width: 1.0,
color: HexColor("#CCCCCC"))),
child: TextFields(
hintText: remarks,
controller: remarksController,
maxLines: 7,
minLines: 4,
),
),
SizedBox(
height: 12.0,
),
SizedBox(
height: MediaQuery.of(context).size.height *
0.12,
),
Container(
margin: EdgeInsets.all(
SizeConfig.widthMultiplier * 2),
child: Wrap(
alignment: WrapAlignment.center,
children: <Widget>[
AppButton(
title: 'update prescription'
.toUpperCase(),
onPressed: () {
updatePrescription(
newDoseStreangth:
strengthController
.text.isNotEmpty
? strengthController
.text
: doseStreangth,
newUnit: units != null
? units['id'].toString()
: doseUnit,
doseUnit: doseUnit,
doseStreangth: doseStreangth,
duration: duration,
startDate: startDate,
doseId: dose,
frequencyId: frequency,
routeId: rouat,
patient: patient,
model: model,
newDuration: updatedDuration !=
null
? updatedDuration['id']
.toString()
: duration,
drugId: drugId,
remarks: remarksController.text,
route: route != null
? route['id'].toString()
: rouat,
frequency: frequencyUpdate != null
? frequencyUpdate['id']
.toString()
: frequency,
dose: doseTime != null
? doseTime['id'].toString()
: dose,
enteredRemarks: enteredRemarks);
Navigator.pop(context);
},
),
],
),
), ),
], ],
), ),
), ],
], ),
), ),
], ));
), });
),
));
}); });
}); });
} }
@ -1016,7 +1244,10 @@ class _NewPrescriptionScreenState extends State<NewPrescriptionScreen> {
String startDate, String startDate,
String doseUnit, String doseUnit,
String doseStreangth, String doseStreangth,
String newDoseStreangth,
String duration, String duration,
String newDuration,
String newUnit,
String enteredRemarks, String enteredRemarks,
PatiantInformtion patient}) async { PatiantInformtion patient}) async {
//PrescriptionViewModel model = PrescriptionViewModel(); //PrescriptionViewModel model = PrescriptionViewModel();
@ -1031,10 +1262,13 @@ class _NewPrescriptionScreenState extends State<NewPrescriptionScreen> {
sss.add(PrescriptionRequestModel( sss.add(PrescriptionRequestModel(
covered: true, covered: true,
dose: int.parse( dose: newDoseStreangth.isNotEmpty
doseStreangth), //frequency.isNotEmpty ? int.parse(dose) : 1, ? int.parse(newDoseStreangth)
: int.parse(
doseStreangth), //frequency.isNotEmpty ? int.parse(dose) : 1,
itemId: drugId, itemId: drugId,
doseUnitId: int.parse(doseUnit), doseUnitId:
newUnit.isNotEmpty ? int.parse(newUnit) : int.parse(doseUnit),
route: route.isNotEmpty ? int.parse(route) : int.parse(routeId), route: route.isNotEmpty ? int.parse(route) : int.parse(routeId),
frequency: frequency.isNotEmpty frequency: frequency.isNotEmpty
? int.parse(frequency) ? int.parse(frequency)
@ -1043,7 +1277,9 @@ class _NewPrescriptionScreenState extends State<NewPrescriptionScreen> {
approvalRequired: true, approvalRequired: true,
icdcode10Id: "test2", icdcode10Id: "test2",
doseTime: dose.isNotEmpty ? int.parse(dose) : int.parse(doseId), doseTime: dose.isNotEmpty ? int.parse(dose) : int.parse(doseId),
duration: int.parse(duration), duration: newDuration.isNotEmpty
? int.parse(newDuration)
: int.parse(duration),
doseStartDate: startDate)); doseStartDate: startDate));
updatePrescriptionReqModel.prescriptionRequestModel = sss; updatePrescriptionReqModel.prescriptionRequestModel = sss;
//postProcedureReqModel.procedures = controlsProcedure; //postProcedureReqModel.procedures = controlsProcedure;

@ -1,14 +1,14 @@
import 'package:doctor_app_flutter/client/base_app_client.dart'; import 'package:doctor_app_flutter/client/base_app_client.dart';
import 'package:doctor_app_flutter/config/config.dart'; import 'package:doctor_app_flutter/config/shared_pref_kay.dart';
import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/config/size_config.dart';
import 'package:doctor_app_flutter/core/enum/viewstate.dart'; import 'package:doctor_app_flutter/core/enum/viewstate.dart';
import 'package:doctor_app_flutter/core/model/procedure/ControlsModel.dart'; import 'package:doctor_app_flutter/core/model/procedure/ControlsModel.dart';
import 'package:doctor_app_flutter/core/model/procedure/categories_procedure.dart'; import 'package:doctor_app_flutter/core/model/procedure/categories_procedure.dart';
import 'package:doctor_app_flutter/core/model/procedure/post_procedure_req_model.dart'; import 'package:doctor_app_flutter/core/model/procedure/post_procedure_req_model.dart';
import 'package:doctor_app_flutter/core/model/procedure/update_procedure_request_model.dart'; import 'package:doctor_app_flutter/core/model/procedure/update_procedure_request_model.dart';
import 'package:doctor_app_flutter/core/viewModel/prescription_view_model.dart';
import 'package:doctor_app_flutter/core/viewModel/procedure_View_model.dart'; import 'package:doctor_app_flutter/core/viewModel/procedure_View_model.dart';
import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart'; import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart';
import 'package:doctor_app_flutter/models/doctor/doctor_profile_model.dart';
import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart';
import 'package:doctor_app_flutter/screens/base/base_view.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart';
import 'package:doctor_app_flutter/screens/procedures/entity_list_checkbox_search_widget.dart'; import 'package:doctor_app_flutter/screens/procedures/entity_list_checkbox_search_widget.dart';
@ -16,17 +16,12 @@ import 'package:doctor_app_flutter/util/dr_app_toast_msg.dart';
import 'package:doctor_app_flutter/util/helpers.dart'; import 'package:doctor_app_flutter/util/helpers.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/patient_profile_widget.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/patient_profile_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/Text.dart';
import 'package:doctor_app_flutter/widgets/shared/TextFields.dart'; import 'package:doctor_app_flutter/widgets/shared/TextFields.dart';
import 'package:doctor_app_flutter/widgets/shared/app_buttons_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_buttons_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/app_text_form_field.dart';
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/dialogs/dailog-list-select.dart'; import 'package:doctor_app_flutter/widgets/shared/dialogs/dailog-list-select.dart';
import 'package:doctor_app_flutter/widgets/shared/divider_with_spaces_around.dart';
import 'package:doctor_app_flutter/widgets/shared/master_key_checkbox_search_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/network_base_view.dart'; import 'package:doctor_app_flutter/widgets/shared/network_base_view.dart';
import 'package:eva_icons_flutter/eva_icons_flutter.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:hexcolor/hexcolor.dart'; import 'package:hexcolor/hexcolor.dart';
@ -46,6 +41,7 @@ class _ProcedureScreenState extends State<ProcedureScreen> {
} }
TextEditingController procedureController = TextEditingController(); TextEditingController procedureController = TextEditingController();
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final routeArgs = ModalRoute.of(context).settings.arguments as Map; final routeArgs = ModalRoute.of(context).settings.arguments as Map;
@ -269,8 +265,16 @@ class _ProcedureScreenState extends State<ProcedureScreen> {
.spaceBetween, .spaceBetween,
children: [ children: [
Container( Container(
height: 120.0, height: MediaQuery.of(
width: 45.0, context)
.size
.height *
0.18,
width: MediaQuery.of(
context)
.size
.width *
0.135,
child: Column( child: Column(
children: [ children: [
AppText( AppText(
@ -312,8 +316,16 @@ class _ProcedureScreenState extends State<ProcedureScreen> {
), ),
Expanded( Expanded(
child: Container( child: Container(
height: 120, height: MediaQuery.of(
width: 325.0, context)
.size
.height *
0.2,
width: MediaQuery.of(
context)
.size
.width *
0.05,
child: Column( child: Column(
children: [ children: [
Row( Row(
@ -415,26 +427,35 @@ class _ProcedureScreenState extends State<ProcedureScreen> {
children: [ children: [
Expanded( Expanded(
child: child:
AppText( Container(
model height: MediaQuery.of(context)
.procedureList[ .size
0] .height *
.entityList[ 0.052,
index] width: MediaQuery.of(context)
.remarks .size
.toString(), .width *
fontSize: 0.10,
13.5, child:
AppText(
model
.procedureList[0]
.entityList[index]
.remarks
.toString(),
fontSize:
11.5,
),
), ),
), ),
], ],
), ),
SizedBox( SizedBox(
height: 10.0, height: 20.0,
), ),
Divider( Divider(
height: 5.0, height: 1.0,
thickness: 1.0, thickness: 1.0,
color: color:
Colors.grey, Colors.grey,

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

@ -1038,6 +1038,10 @@ class TranslationBase {
localizedValues['chiefComplaintErrorMsg'][locale.languageCode]; localizedValues['chiefComplaintErrorMsg'][locale.languageCode];
String get ICDName => String get ICDName =>
localizedValues['ICDName'][locale.languageCode]; localizedValues['ICDName'][locale.languageCode];
String get referralStatus =>
localizedValues['referralStatus'][locale.languageCode];
String get referralRemark =>
localizedValues['referralRemark'][locale.languageCode];
} }
class TranslationBaseDelegate extends LocalizationsDelegate<TranslationBase> { class TranslationBaseDelegate extends LocalizationsDelegate<TranslationBase> {

@ -37,25 +37,36 @@ class PatientReferralItemWidget extends StatelessWidget {
children: <Widget>[ children: <Widget>[
Center( Center(
child: AppText( child: AppText(
"${patientName}", patientName != null ? "${patientName}" : "",
color: Colors.black, color: Colors.black,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
fontSize: 16, fontSize: 16,
), ),
), ),
if (referralStatus != null) if (referralStatus != null)
Container( Row(
color: Color(0xFF4BA821), children: [
padding: EdgeInsets.all(4), AppText(
child: AppText( TranslationBase.of(context).referralStatus,
referralStatus color: Colors.grey,
/*referralStatus == "46" fontWeight: FontWeight.bold,
? TranslationBase.of(context).approved fontSize: 12,
: TranslationBase.of(context).rejected*/, ),
color: Colors.white, Container(
fontWeight: FontWeight.bold, color: Color(0xFF4BA821),
fontSize: 12, padding: EdgeInsets.all(4),
), child: AppText(
referralStatus
/*referralStatus == "46"
? TranslationBase.of(context).approved
: TranslationBase.of(context).rejected*/
,
color: Colors.white,
fontWeight: FontWeight.bold,
fontSize: 12,
),
),
],
), ),
SizedBox( SizedBox(
height: 8, height: 8,
@ -83,11 +94,26 @@ class PatientReferralItemWidget extends StatelessWidget {
SizedBox( SizedBox(
height: 8, height: 8,
), ),
AppText( Row(
"${TranslationBase.of(context).dr} $referralDoctorName", crossAxisAlignment: CrossAxisAlignment.start,
color: Colors.black, children: [
fontWeight: FontWeight.bold, AppText(
fontSize: 12, "${TranslationBase.of(context).referralDoctor} : ",
color: Colors.grey,
fontWeight: FontWeight.bold,
fontSize: 12,
),
Expanded(
child: AppText(
referralDoctorName != null
? "${TranslationBase.of(context).dr} $referralDoctorName"
: "",
color: Colors.black,
fontWeight: FontWeight.bold,
fontSize: 12,
),
),
],
), ),
SizedBox( SizedBox(
height: 8, height: 8,
@ -112,11 +138,21 @@ class PatientReferralItemWidget extends StatelessWidget {
SizedBox( SizedBox(
height: 8, height: 8,
), ),
AppText( Row(
remark, children: [
color: Colors.grey, AppText(
fontWeight: FontWeight.normal, TranslationBase.of(context).referralRemark,
fontSize: 12, color: Colors.grey,
fontWeight: FontWeight.bold,
fontSize: 12,
),
AppText(
remark,
color: Colors.grey,
fontWeight: FontWeight.normal,
fontSize: 12,
),
],
), ),
SizedBox( SizedBox(
height: 16, height: 16,

Loading…
Cancel
Save