Merge branch 'sultan' into 'development'

Sultan

See merge request Cloud_Solution/doctor_app_flutter!570
merge-requests/571/merge
Mohammad Aljammal 5 years ago
commit 1bb142f39e

@ -589,24 +589,23 @@ class _PatientsScreenState extends State<PatientsScreen> {
SizedBox( SizedBox(
height: 10.0, height: 10.0,
), ),
if (int.parse(patientType) == 7) // if (int.parse(patientType) == 7)
Container( // Container(
padding: EdgeInsets.all(5), // padding: EdgeInsets.all(5),
decoration: BoxDecoration( // decoration: BoxDecoration(
color: Colors.white, // color: Colors.white,
border: Border.all( // border: Border.all(
color: Colors.grey), // color: Colors.grey),
borderRadius: // borderRadius:
BorderRadius.circular( // BorderRadius.circular(10)),
10)), // child: ClinicList(
child: ClinicList( // clinicId: clinicId,
clinicId: clinicId, // onClinicChange: (newValue) {
onClinicChange: (newValue) { // clinicId = newValue;
clinicId = newValue; // changeClinic(
changeClinic( // newValue, context, model);
newValue, context, model); // },
}, // )),
)),
Padding( Padding(
padding: EdgeInsets.only( padding: EdgeInsets.only(
top: MediaQuery.of(context) top: MediaQuery.of(context)
@ -616,7 +615,7 @@ class _PatientsScreenState extends State<PatientsScreen> {
// child: _locationBar(context) // child: _locationBar(context)
child: SERVICES_PATIANT2[ child: SERVICES_PATIANT2[
int.parse(patientType)] == int.parse(patientType)] ==
"patientArrivalList" "List_MyOutPatient"
? _locationBar(context, model) ? _locationBar(context, model)
: Container(), : Container(),
), ),
@ -657,7 +656,8 @@ class _PatientsScreenState extends State<PatientsScreen> {
isInpatient, isInpatient,
"arrivalType": "arrivalType":
arrivalType, arrivalType,
"isInpatient":isInpatient "isInpatient":
isInpatient
}); });
}, },
); );
@ -903,13 +903,17 @@ class _PatientsScreenState extends State<PatientsScreen> {
GifLoaderDialogUtils.showMyDialog(context); GifLoaderDialogUtils.showMyDialog(context);
int val2 = int.parse(patientType); int val2 = int.parse(patientType);
GetPatientArrivalListRequestModel getPatientArrivalListRequestModel; GetPatientArrivalListRequestModel getPatientArrivalListRequestModel;
if (val2 == 7) { if (val2 == 0) {
getPatientArrivalListRequestModel = GetPatientArrivalListRequestModel( patient = PatientModel(
from: _patientSearchFormValues.From, From: _patientSearchFormValues.From,
to: _patientSearchFormValues.To, To: _patientSearchFormValues.To,
pageIndex: 0, FirstName: "0",
pageSize: 0, MiddleName: "0",
patientMRN: patient.getPatientID); LastName: "0",
PatientMobileNumber: "0",
PatientIdentificationID: "0",
PatientID: 0,
);
} }
model model

@ -62,6 +62,13 @@ class _UpdateNoteOrderState extends State<UpdateNoteOrder> {
@override @override
void initState() { void initState() {
requestPermissions(); requestPermissions();
event.controller.stream.listen((p) {
if (p['startPopUp'] == 'true') {
if (this.mounted) {
onVoiceText();
}
}
});
super.initState(); super.initState();
} }
@ -236,7 +243,11 @@ class _UpdateNoteOrderState extends State<UpdateNoteOrder> {
} }
} }
void errorListener(SpeechRecognitionError error) {} void errorListener(SpeechRecognitionError error) {
event.setValue({"searchText": 'null'});
//SpeechToText.closeAlertDialog(context);
print(error);
}
void statusListener(String status) { void statusListener(String status) {
reconizedWord = status == 'listening' ? 'Lisening...' : 'Sorry....'; reconizedWord = status == 'listening' ? 'Lisening...' : 'Sorry....';
@ -257,6 +268,8 @@ class _UpdateNoteOrderState extends State<UpdateNoteOrder> {
SpeechToText.closeAlertDialog(context); SpeechToText.closeAlertDialog(context);
progressNoteController.text = reconizedWord; progressNoteController.text = reconizedWord;
}); });
} else {
print(result.finalResult);
} }
} }
} }

@ -75,6 +75,10 @@ class _MyStatefulBuilderState extends State<MyStatefulBuilder> {
setState(() { setState(() {
searchText = p['searchText']; searchText = p['searchText'];
}); });
} else if (p['searchText'] == 'null') {
setState(() {
searchText = p['searchText'];
});
} }
}); });
super.initState(); super.initState();

Loading…
Cancel
Save