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

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

Browse Source 
 Conflicts:
	lib/config/localized_values.dart
	lib/util/translations_delegate_base.dart
merge-requests/275/head
Elham Rababah 4 years ago
parent fd17fc4608 6d473be371
commit 7db8a42adc
11 changed files with 720 additions and 372 deletions
Show Stats Download Patch File Download Diff File

10
lib/config/localized_values.dart
Unescape Escape View File

@ -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"

2
lib/core/viewModel/patient-referral-viewmodel.dart
Unescape Escape View File

@ -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);
} }

23
lib/core/viewModel/patient-vital-sign-viewmodel.dart
Unescape Escape View File

@ -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,7 +93,8 @@ 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";
} }
} }
@ -103,5 +113,4 @@ class VitalSignsViewModel extends BaseViewModel {
return "Temporal"; return "Temporal";
} }
} }
} }

26
lib/screens/medical-file/medical_file_page.dart
Unescape Escape View File

@ -41,14 +41,15 @@ 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)
? ListView.builder(
//physics: , //physics: ,
physics: NeverScrollableScrollPhysics(), physics: NeverScrollableScrollPhysics(),
scrollDirection: Axis.vertical, scrollDirection: Axis.vertical,
shrinkWrap: true, shrinkWrap: true,
itemCount: model itemCount: model.medicalFileList[0].entityList[0]
.medicalFileList[0].entityList[0].timelines.length, .timelines.length,
itemBuilder: (BuildContext ctxt, int index) { itemBuilder: (BuildContext ctxt, int index) {
return Padding( return Padding(
padding: EdgeInsets.symmetric( padding: EdgeInsets.symmetric(
@ -101,8 +102,11 @@ class _MedicalFilePageState extends State<MedicalFilePage> {
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
), ),
AppText( AppText(
model.medicalFileList[0].entityList[0] model
.timelines[index].clinicName, .medicalFileList[0]
.entityList[0]
.timelines[index]
.clinicName,
), ),
], ],
), ),
@ -119,7 +123,8 @@ class _MedicalFilePageState extends State<MedicalFilePage> {
Navigator.push( Navigator.push(
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: (context) => MedicalFileDetails( builder: (context) =>
MedicalFileDetails(
age: patient.age, age: patient.age,
firstName: patient.firstName, firstName: patient.firstName,
lastName: patient.lastName, lastName: patient.lastName,
@ -132,6 +137,13 @@ class _MedicalFilePageState extends State<MedicalFilePage> {
), ),
); );
}) })
: Center(
child: Container(
child: AppText(
'THERES NO MEDICAL FILE FOR THIS Patient',
),
),
)
], ],
), ),
), ),

16
lib/screens/patients/profile/referral/my-referral-detail-screen.dart
Unescape Escape View File

@ -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);
}
}, },
), ),
), ),

34
lib/screens/prescription/add_prescription_form.dart
Unescape Escape View File

@ -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
? () { ? () {

298
lib/screens/prescription/prescription_screen.dart
Unescape Escape View File

@ -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
@ -581,6 +628,10 @@ class _NewPrescriptionScreenState extends State<NewPrescriptionScreen> {
Row( Row(
children: [ children: [
Expanded( Expanded(
child:
Container(
height:
30,
child: child:
AppText( AppText(
model model
@ -588,7 +639,8 @@ class _NewPrescriptionScreenState extends State<NewPrescriptionScreen> {
.entityList[index] .entityList[index]
.remarks, .remarks,
fontSize: fontSize:
14.0, 11.5,
),
), ),
), ),
], ],
@ -792,12 +844,18 @@ 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 DraggableScrollableSheet(
initialChildSize: 0.90,
maxChildSize: 0.90,
minChildSize: 0.6,
builder:
(BuildContext context, ScrollController scrollController) {
return Container( return Container(
height: MediaQuery.of(context).size.height * 0.73, height: MediaQuery.of(context).size.height * 1.0,
child: Form( child: Form(
child: Padding( child: Padding(
padding: padding: EdgeInsets.symmetric(
EdgeInsets.symmetric(horizontal: 20.0, vertical: 12.0), horizontal: 20.0, vertical: 12.0),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
@ -806,13 +864,106 @@ class _NewPrescriptionScreenState extends State<NewPrescriptionScreen> {
fontWeight: FontWeight.w900, fontWeight: FontWeight.w900,
), ),
SizedBox( SizedBox(
height: 30.0, height: 10.0,
), ),
Column( Column(
children: [ children: [
Container( Container(
height: height: MediaQuery.of(context).size.height *
MediaQuery.of(context).size.height * 0.070, 0.070,
width: double.infinity,
child: Row(
children: [
Container(
width: MediaQuery.of(context)
.size
.width *
0.550,
child: TextFields(
inputFormatters: [
LengthLimitingTextInputFormatter(
4)
],
hintText:
TranslationBase.of(context)
.strength,
controller: strengthController,
keyboardType: TextInputType.number,
onChanged: (String value) {
setState(() {
strengthChar = value.length;
});
if (strengthChar >= 4) {
DrAppToastMsg.showErrorToast(
"Only 4 Digits allowed for strength");
}
},
// validator: (value) {
// if (value.isEmpty &&
// strengthController.text.length >
// 4)
// 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( child: InkWell(
onTap: routeList != null onTap: routeList != null
? () { ? () {
@ -822,7 +973,8 @@ class _NewPrescriptionScreenState extends State<NewPrescriptionScreen> {
attributeName: 'name', attributeName: 'name',
attributeValueId: 'id', attributeValueId: 'id',
okText: okText:
TranslationBase.of(context).ok, TranslationBase.of(context)
.ok,
okFunction: (selectedValue) { okFunction: (selectedValue) {
setState(() { setState(() {
route = selectedValue; route = selectedValue;
@ -835,7 +987,8 @@ class _NewPrescriptionScreenState extends State<NewPrescriptionScreen> {
showDialog( showDialog(
barrierDismissible: false, barrierDismissible: false,
context: context, context: context,
builder: (BuildContext context) { builder:
(BuildContext context) {
return dialog; return dialog;
}, },
); );
@ -844,7 +997,9 @@ class _NewPrescriptionScreenState extends State<NewPrescriptionScreen> {
child: TextField( child: TextField(
decoration: textFieldSelectorDecoration( decoration: textFieldSelectorDecoration(
TranslationBase.of(context).route, TranslationBase.of(context).route,
route != null ? route['name'] : null, route != null
? route['name']
: null,
true), true),
enabled: false, enabled: false,
), ),
@ -854,8 +1009,8 @@ class _NewPrescriptionScreenState extends State<NewPrescriptionScreen> {
height: 12.0, height: 12.0,
), ),
Container( Container(
height: height: MediaQuery.of(context).size.height *
MediaQuery.of(context).size.height * 0.070, 0.070,
child: InkWell( child: InkWell(
onTap: doseTimeList != null onTap: doseTimeList != null
? () { ? () {
@ -865,7 +1020,8 @@ class _NewPrescriptionScreenState extends State<NewPrescriptionScreen> {
attributeName: 'name', attributeName: 'name',
attributeValueId: 'id', attributeValueId: 'id',
okText: okText:
TranslationBase.of(context).ok, TranslationBase.of(context)
.ok,
okFunction: (selectedValue) { okFunction: (selectedValue) {
setState(() { setState(() {
doseTime = selectedValue; doseTime = selectedValue;
@ -875,7 +1031,8 @@ class _NewPrescriptionScreenState extends State<NewPrescriptionScreen> {
showDialog( showDialog(
barrierDismissible: false, barrierDismissible: false,
context: context, context: context,
builder: (BuildContext context) { builder:
(BuildContext context) {
return dialog; return dialog;
}, },
); );
@ -883,7 +1040,8 @@ class _NewPrescriptionScreenState extends State<NewPrescriptionScreen> {
: null, : null,
child: TextField( child: TextField(
decoration: textFieldSelectorDecoration( decoration: textFieldSelectorDecoration(
TranslationBase.of(context).doseTime, TranslationBase.of(context)
.doseTime,
doseTime != null doseTime != null
? doseTime['name'] ? doseTime['name']
: null, : null,
@ -896,8 +1054,8 @@ class _NewPrescriptionScreenState extends State<NewPrescriptionScreen> {
height: 12.0, height: 12.0,
), ),
Container( Container(
height: height: MediaQuery.of(context).size.height *
MediaQuery.of(context).size.height * 0.070, 0.070,
child: InkWell( child: InkWell(
onTap: frequencyList != null onTap: frequencyList != null
? () { ? () {
@ -907,17 +1065,20 @@ class _NewPrescriptionScreenState extends State<NewPrescriptionScreen> {
attributeName: 'name', attributeName: 'name',
attributeValueId: 'id', attributeValueId: 'id',
okText: okText:
TranslationBase.of(context).ok, TranslationBase.of(context)
.ok,
okFunction: (selectedValue) { okFunction: (selectedValue) {
setState(() { setState(() {
frequencyUpdate = selectedValue; frequencyUpdate =
selectedValue;
}); });
}, },
); );
showDialog( showDialog(
barrierDismissible: false, barrierDismissible: false,
context: context, context: context,
builder: (BuildContext context) { builder:
(BuildContext context) {
return dialog; return dialog;
}, },
); );
@ -925,7 +1086,8 @@ class _NewPrescriptionScreenState extends State<NewPrescriptionScreen> {
: null, : null,
child: TextField( child: TextField(
decoration: textFieldSelectorDecoration( decoration: textFieldSelectorDecoration(
TranslationBase.of(context).frequency, TranslationBase.of(context)
.frequency,
frequencyUpdate != null frequencyUpdate != null
? frequencyUpdate['name'] ? frequencyUpdate['name']
: null, : null,
@ -937,12 +1099,60 @@ class _NewPrescriptionScreenState extends State<NewPrescriptionScreen> {
SizedBox( SizedBox(
height: 12.0, 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( Container(
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: borderRadius: BorderRadius.all(
BorderRadius.all(Radius.circular(6.0)), Radius.circular(6.0)),
border: Border.all( border: Border.all(
width: 1.0, color: HexColor("#CCCCCC"))), width: 1.0,
color: HexColor("#CCCCCC"))),
child: TextFields( child: TextFields(
hintText: remarks, hintText: remarks,
controller: remarksController, controller: remarksController,
@ -954,7 +1164,8 @@ class _NewPrescriptionScreenState extends State<NewPrescriptionScreen> {
height: 12.0, height: 12.0,
), ),
SizedBox( SizedBox(
height: MediaQuery.of(context).size.height * 0.12, height: MediaQuery.of(context).size.height *
0.12,
), ),
Container( Container(
margin: EdgeInsets.all( margin: EdgeInsets.all(
@ -963,9 +1174,19 @@ class _NewPrescriptionScreenState extends State<NewPrescriptionScreen> {
alignment: WrapAlignment.center, alignment: WrapAlignment.center,
children: <Widget>[ children: <Widget>[
AppButton( AppButton(
title: 'update prescription'.toUpperCase(), title: 'update prescription'
.toUpperCase(),
onPressed: () { onPressed: () {
updatePrescription( updatePrescription(
newDoseStreangth:
strengthController
.text.isNotEmpty
? strengthController
.text
: doseStreangth,
newUnit: units != null
? units['id'].toString()
: doseUnit,
doseUnit: doseUnit, doseUnit: doseUnit,
doseStreangth: doseStreangth, doseStreangth: doseStreangth,
duration: duration, duration: duration,
@ -975,13 +1196,19 @@ class _NewPrescriptionScreenState extends State<NewPrescriptionScreen> {
routeId: rouat, routeId: rouat,
patient: patient, patient: patient,
model: model, model: model,
newDuration: updatedDuration !=
null
? updatedDuration['id']
.toString()
: duration,
drugId: drugId, drugId: drugId,
remarks: remarksController.text, remarks: remarksController.text,
route: route != null route: route != null
? route['id'].toString() ? route['id'].toString()
: rouat, : rouat,
frequency: frequencyUpdate != null frequency: frequencyUpdate != null
? frequencyUpdate['id'].toString() ? frequencyUpdate['id']
.toString()
: frequency, : frequency,
dose: doseTime != null dose: doseTime != null
? doseTime['id'].toString() ? doseTime['id'].toString()
@ -1001,6 +1228,7 @@ class _NewPrescriptionScreenState extends State<NewPrescriptionScreen> {
)); ));
}); });
}); });
});
} }
updatePrescription( updatePrescription(
@ -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
? int.parse(newDoseStreangth)
: int.parse(
doseStreangth), //frequency.isNotEmpty ? int.parse(dose) : 1, 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;

57
lib/screens/procedures/procedure_screen.dart
Unescape Escape View File

@ -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(
@ -414,27 +426,36 @@ class _ProcedureScreenState extends State<ProcedureScreen> {
Row( Row(
children: [ children: [
Expanded( Expanded(
child:
Container(
height: MediaQuery.of(context)
.size
.height *
0.052,
width: MediaQuery.of(context)
.size
.width *
0.10,
child: child:
AppText( AppText(
model model
.procedureList[ .procedureList[0]
0] .entityList[index]
.entityList[
index]
.remarks .remarks
.toString(), .toString(),
fontSize: fontSize:
13.5, 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,

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

@ -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);
} }

4
lib/util/translations_delegate_base.dart
Unescape Escape View File

@ -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> {

42
lib/widgets/patients/patient-referral-item-widget.dart
Unescape Escape View File

@ -37,13 +37,21 @@ 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)
Row(
children: [
AppText(
TranslationBase.of(context).referralStatus,
color: Colors.grey,
fontWeight: FontWeight.bold,
fontSize: 12,
),
Container( Container(
color: Color(0xFF4BA821), color: Color(0xFF4BA821),
padding: EdgeInsets.all(4), padding: EdgeInsets.all(4),
@ -51,12 +59,15 @@ class PatientReferralItemWidget extends StatelessWidget {
referralStatus referralStatus
/*referralStatus == "46" /*referralStatus == "46"
? TranslationBase.of(context).approved ? TranslationBase.of(context).approved
: TranslationBase.of(context).rejected*/, : TranslationBase.of(context).rejected*/
,
color: Colors.white, color: Colors.white,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
fontSize: 12, fontSize: 12,
), ),
), ),
],
),
SizedBox( SizedBox(
height: 8, height: 8,
), ),
@ -83,12 +94,27 @@ class PatientReferralItemWidget extends StatelessWidget {
SizedBox( SizedBox(
height: 8, height: 8,
), ),
Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
AppText( AppText(
"${TranslationBase.of(context).dr} $referralDoctorName", "${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, color: Colors.black,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
fontSize: 12, fontSize: 12,
), ),
),
],
),
SizedBox( SizedBox(
height: 8, height: 8,
), ),
@ -112,12 +138,22 @@ class PatientReferralItemWidget extends StatelessWidget {
SizedBox( SizedBox(
height: 8, height: 8,
), ),
Row(
children: [
AppText(
TranslationBase.of(context).referralRemark,
color: Colors.grey,
fontWeight: FontWeight.bold,
fontSize: 12,
),
AppText( AppText(
remark, remark,
color: Colors.grey, color: Colors.grey,
fontWeight: FontWeight.normal, fontWeight: FontWeight.normal,
fontSize: 12, fontSize: 12,
), ),
],
),
SizedBox( SizedBox(
height: 16, height: 16,
), ),

Write Preview
Loading…
Cancel
Save