|
|
@ -1,26 +1,27 @@
|
|
|
|
import 'package:doctor_app_flutter/config/shared_pref_kay.dart';
|
|
|
|
import 'package:doctor_app_flutter/config/shared_pref_kay.dart';
|
|
|
|
|
|
|
|
import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart';
|
|
|
|
import 'package:doctor_app_flutter/models/patient/patient_model.dart';
|
|
|
|
import 'package:doctor_app_flutter/models/patient/patient_model.dart';
|
|
|
|
import 'package:doctor_app_flutter/providers/project_provider.dart';
|
|
|
|
import 'package:doctor_app_flutter/providers/project_provider.dart';
|
|
|
|
import 'package:doctor_app_flutter/routes.dart';
|
|
|
|
import 'package:doctor_app_flutter/routes.dart';
|
|
|
|
import 'package:doctor_app_flutter/util/dr_app_shared_pref.dart';
|
|
|
|
import 'package:doctor_app_flutter/util/dr_app_shared_pref.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:flutter/material.dart';
|
|
|
|
|
|
|
|
import 'package:flutter/rendering.dart';
|
|
|
|
import 'package:flutter/services.dart';
|
|
|
|
import 'package:flutter/services.dart';
|
|
|
|
|
|
|
|
import 'package:hexcolor/hexcolor.dart';
|
|
|
|
|
|
|
|
import 'package:provider/provider.dart';
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
import '../../config/config.dart';
|
|
|
|
import '../../config/size_config.dart';
|
|
|
|
import '../../config/size_config.dart';
|
|
|
|
|
|
|
|
import '../../lookups/patient_lookup.dart';
|
|
|
|
|
|
|
|
import '../../models/doctor/doctor_profile_model.dart';
|
|
|
|
|
|
|
|
import '../../widgets/patients/dynamic_elements.dart';
|
|
|
|
import '../../widgets/shared/app_buttons_widget.dart';
|
|
|
|
import '../../widgets/shared/app_buttons_widget.dart';
|
|
|
|
import '../../widgets/shared/app_scaffold_widget.dart';
|
|
|
|
import '../../widgets/shared/app_scaffold_widget.dart';
|
|
|
|
import '../../widgets/shared/app_text_form_field.dart';
|
|
|
|
import '../../widgets/shared/app_text_form_field.dart';
|
|
|
|
import '../../widgets/shared/app_texts_widget.dart';
|
|
|
|
import '../../widgets/shared/app_texts_widget.dart';
|
|
|
|
import '../../widgets/shared/rounded_container_widget.dart';
|
|
|
|
import '../../widgets/shared/rounded_container_widget.dart';
|
|
|
|
import 'package:flutter/material.dart';
|
|
|
|
|
|
|
|
import 'package:flutter/rendering.dart';
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
import '../../lookups/patient_lookup.dart';
|
|
|
|
|
|
|
|
import '../../widgets/patients/dynamic_elements.dart';
|
|
|
|
|
|
|
|
import '../../config/config.dart';
|
|
|
|
|
|
|
|
import '../../models/doctor/doctor_profile_model.dart';
|
|
|
|
|
|
|
|
import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
|
|
|
|
|
|
|
|
import 'package:provider/provider.dart';
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
DrAppSharedPreferances sharedPref = new DrAppSharedPreferances();
|
|
|
|
DrAppSharedPreferances sharedPref = new DrAppSharedPreferances();
|
|
|
|
Helpers helpers = Helpers();
|
|
|
|
Helpers helpers = Helpers();
|
|
|
@ -126,10 +127,35 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
|
|
|
|
RoundedContainer(
|
|
|
|
RoundedContainer(
|
|
|
|
child: Column(
|
|
|
|
child: Column(
|
|
|
|
children: <Widget>[
|
|
|
|
children: <Widget>[
|
|
|
|
Icon(
|
|
|
|
Column(
|
|
|
|
Icons.search,
|
|
|
|
children: <Widget>[
|
|
|
|
size: SizeConfig.imageSizeMultiplier * 15,
|
|
|
|
Container(
|
|
|
|
|
|
|
|
child: Icon(
|
|
|
|
|
|
|
|
DoctorApp.search_patient,
|
|
|
|
|
|
|
|
size: 100,
|
|
|
|
|
|
|
|
color: Colors.black,
|
|
|
|
),
|
|
|
|
),
|
|
|
|
|
|
|
|
margin: EdgeInsets.only(top: 10),
|
|
|
|
|
|
|
|
),
|
|
|
|
|
|
|
|
Padding(
|
|
|
|
|
|
|
|
padding: const EdgeInsets.only(top: 12.0),
|
|
|
|
|
|
|
|
child: AppText(
|
|
|
|
|
|
|
|
TranslationBase.of(context).searchPatientImageCaptionTitle.toUpperCase(),
|
|
|
|
|
|
|
|
fontWeight: FontWeight.bold,
|
|
|
|
|
|
|
|
fontSize: SizeConfig.heightMultiplier * 2.5,
|
|
|
|
|
|
|
|
),
|
|
|
|
|
|
|
|
),
|
|
|
|
|
|
|
|
Padding(
|
|
|
|
|
|
|
|
padding: const EdgeInsets.only(top: 5.0),
|
|
|
|
|
|
|
|
child: AppText(
|
|
|
|
|
|
|
|
TranslationBase.of(context)
|
|
|
|
|
|
|
|
.searchPatientImageCaptionBody,
|
|
|
|
|
|
|
|
fontSize: SizeConfig.heightMultiplier * 2,
|
|
|
|
|
|
|
|
),
|
|
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
],
|
|
|
|
|
|
|
|
),
|
|
|
|
|
|
|
|
|
|
|
|
Container(
|
|
|
|
Container(
|
|
|
|
padding: EdgeInsets.all(15),
|
|
|
|
padding: EdgeInsets.all(15),
|
|
|
|
width: SizeConfig.screenWidth * 1,
|
|
|
|
width: SizeConfig.screenWidth * 1,
|
|
|
@ -143,20 +169,18 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
|
|
|
|
height: 5,
|
|
|
|
height: 5,
|
|
|
|
),
|
|
|
|
),
|
|
|
|
Container(
|
|
|
|
Container(
|
|
|
|
|
|
|
|
height: 40.0,
|
|
|
|
decoration: ShapeDecoration(
|
|
|
|
decoration: ShapeDecoration(
|
|
|
|
shape: RoundedRectangleBorder(
|
|
|
|
shape: RoundedRectangleBorder(
|
|
|
|
side: BorderSide(
|
|
|
|
side: BorderSide(
|
|
|
|
width: 1.0,
|
|
|
|
width: 1.0,
|
|
|
|
style: BorderStyle.solid,
|
|
|
|
style: BorderStyle.solid,
|
|
|
|
color: Color(0xff707070)),
|
|
|
|
color: Hexcolor("#CCCCCC")),
|
|
|
|
borderRadius:
|
|
|
|
borderRadius:
|
|
|
|
BorderRadius.all(Radius.circular(5.0)),
|
|
|
|
BorderRadius.all(Radius.circular(6.0)),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
// margin: 0,
|
|
|
|
|
|
|
|
// showBorder: true,
|
|
|
|
|
|
|
|
// raduis: 30,
|
|
|
|
|
|
|
|
// borderColor: Color(0xff707070),
|
|
|
|
|
|
|
|
width: double.infinity,
|
|
|
|
width: double.infinity,
|
|
|
|
child: Padding(
|
|
|
|
child: Padding(
|
|
|
|
padding: EdgeInsets.only(
|
|
|
|
padding: EdgeInsets.only(
|
|
|
@ -173,7 +197,7 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
|
|
|
|
child: DropdownButton(
|
|
|
|
child: DropdownButton(
|
|
|
|
isExpanded: true,
|
|
|
|
isExpanded: true,
|
|
|
|
value: _selectedType,
|
|
|
|
value: _selectedType,
|
|
|
|
iconSize: 40,
|
|
|
|
iconSize: 25,
|
|
|
|
elevation: 16,
|
|
|
|
elevation: 16,
|
|
|
|
selectedItemBuilder:
|
|
|
|
selectedItemBuilder:
|
|
|
|
(BuildContext context) {
|
|
|
|
(BuildContext context) {
|
|
|
@ -198,7 +222,8 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
|
|
|
|
);
|
|
|
|
);
|
|
|
|
}).toList();
|
|
|
|
}).toList();
|
|
|
|
},
|
|
|
|
},
|
|
|
|
onChanged: (String newValue) => {
|
|
|
|
onChanged: (String newValue) =>
|
|
|
|
|
|
|
|
{
|
|
|
|
setState(() {
|
|
|
|
setState(() {
|
|
|
|
_selectedType = newValue;
|
|
|
|
_selectedType = newValue;
|
|
|
|
selectedPatientType =
|
|
|
|
selectedPatientType =
|
|
|
@ -226,8 +251,21 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
|
|
|
|
SizedBox(
|
|
|
|
SizedBox(
|
|
|
|
height: 10,
|
|
|
|
height: 10,
|
|
|
|
),
|
|
|
|
),
|
|
|
|
AppTextFormField(
|
|
|
|
Container(
|
|
|
|
hintText: TranslationBase.of(context).firstName,
|
|
|
|
decoration: BoxDecoration(
|
|
|
|
|
|
|
|
borderRadius: BorderRadius.all(
|
|
|
|
|
|
|
|
Radius.circular(6.0)),
|
|
|
|
|
|
|
|
border: Border.all(
|
|
|
|
|
|
|
|
width: 1.0, color: Hexcolor("#CCCCCC"))
|
|
|
|
|
|
|
|
),
|
|
|
|
|
|
|
|
padding: EdgeInsets.only(top: 5),
|
|
|
|
|
|
|
|
child: AppTextFormField(
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
labelText: TranslationBase
|
|
|
|
|
|
|
|
.of(context)
|
|
|
|
|
|
|
|
.firstName,
|
|
|
|
|
|
|
|
borderColor: Colors.white,
|
|
|
|
|
|
|
|
|
|
|
|
onSaved: (value) {
|
|
|
|
onSaved: (value) {
|
|
|
|
value == null
|
|
|
|
value == null
|
|
|
|
? _patientSearchFormValues.setFirstName =
|
|
|
|
? _patientSearchFormValues.setFirstName =
|
|
|
@ -235,7 +273,10 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
|
|
|
|
: _patientSearchFormValues.setFirstName =
|
|
|
|
: _patientSearchFormValues.setFirstName =
|
|
|
|
value;
|
|
|
|
value;
|
|
|
|
|
|
|
|
|
|
|
|
if (value.toString().trim().isEmpty) {
|
|
|
|
if (value
|
|
|
|
|
|
|
|
.toString()
|
|
|
|
|
|
|
|
.trim()
|
|
|
|
|
|
|
|
.isEmpty) {
|
|
|
|
_patientSearchFormValues.setFirstName = "0";
|
|
|
|
_patientSearchFormValues.setFirstName = "0";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
},
|
|
|
|
},
|
|
|
@ -243,49 +284,90 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
|
|
|
|
// return TextValidator().validateName(value);
|
|
|
|
// return TextValidator().validateName(value);
|
|
|
|
// },
|
|
|
|
// },
|
|
|
|
inputFormatter: ONLY_LETTERS),
|
|
|
|
inputFormatter: ONLY_LETTERS),
|
|
|
|
|
|
|
|
),
|
|
|
|
SizedBox(
|
|
|
|
SizedBox(
|
|
|
|
height: 10,
|
|
|
|
height: 10,
|
|
|
|
),
|
|
|
|
),
|
|
|
|
AppTextFormField(
|
|
|
|
Container(
|
|
|
|
hintText: TranslationBase.of(context).middleName,
|
|
|
|
decoration: BoxDecoration(
|
|
|
|
|
|
|
|
borderRadius: BorderRadius.all(
|
|
|
|
|
|
|
|
Radius.circular(6.0)),
|
|
|
|
|
|
|
|
border: Border.all(
|
|
|
|
|
|
|
|
width: 1.0, color: Hexcolor("#CCCCCC"))
|
|
|
|
|
|
|
|
),
|
|
|
|
|
|
|
|
padding: EdgeInsets.only(top: 5),
|
|
|
|
|
|
|
|
child: AppTextFormField(
|
|
|
|
|
|
|
|
labelText: TranslationBase
|
|
|
|
|
|
|
|
.of(context)
|
|
|
|
|
|
|
|
.middleName,
|
|
|
|
|
|
|
|
borderColor: Colors.white,
|
|
|
|
onSaved: (value) {
|
|
|
|
onSaved: (value) {
|
|
|
|
value == null
|
|
|
|
value == null
|
|
|
|
? _patientSearchFormValues.setMiddleName =
|
|
|
|
? _patientSearchFormValues.setMiddleName =
|
|
|
|
"0"
|
|
|
|
"0"
|
|
|
|
: _patientSearchFormValues.setMiddleName =
|
|
|
|
: _patientSearchFormValues.setMiddleName =
|
|
|
|
value;
|
|
|
|
value;
|
|
|
|
if (value.toString().trim().isEmpty) {
|
|
|
|
if (value
|
|
|
|
_patientSearchFormValues.setMiddleName = "0";
|
|
|
|
.toString()
|
|
|
|
|
|
|
|
.trim()
|
|
|
|
|
|
|
|
.isEmpty) {
|
|
|
|
|
|
|
|
_patientSearchFormValues.setMiddleName =
|
|
|
|
|
|
|
|
"0";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
},
|
|
|
|
},
|
|
|
|
// validator: (value) {
|
|
|
|
// validator: (value) {
|
|
|
|
// return TextValidator().validateName(value);
|
|
|
|
// return TextValidator().validateName(value);
|
|
|
|
// },
|
|
|
|
// },
|
|
|
|
inputFormatter: ONLY_LETTERS),
|
|
|
|
inputFormatter: ONLY_LETTERS),
|
|
|
|
|
|
|
|
),
|
|
|
|
SizedBox(
|
|
|
|
SizedBox(
|
|
|
|
height: 10,
|
|
|
|
height: 10,
|
|
|
|
),
|
|
|
|
),
|
|
|
|
AppTextFormField(
|
|
|
|
Container(
|
|
|
|
hintText: TranslationBase.of(context).lastName,
|
|
|
|
decoration: BoxDecoration(
|
|
|
|
|
|
|
|
borderRadius: BorderRadius.all(
|
|
|
|
|
|
|
|
Radius.circular(6.0)),
|
|
|
|
|
|
|
|
border: Border.all(
|
|
|
|
|
|
|
|
width: 1.0, color: Hexcolor("#CCCCCC"))
|
|
|
|
|
|
|
|
),
|
|
|
|
|
|
|
|
padding: EdgeInsets.only(top: 5),
|
|
|
|
|
|
|
|
child: AppTextFormField(
|
|
|
|
|
|
|
|
labelText: TranslationBase
|
|
|
|
|
|
|
|
.of(context)
|
|
|
|
|
|
|
|
.lastName,
|
|
|
|
|
|
|
|
borderColor: Colors.white,
|
|
|
|
onSaved: (value) {
|
|
|
|
onSaved: (value) {
|
|
|
|
value == null
|
|
|
|
value == null
|
|
|
|
? _patientSearchFormValues.setLastName = "0"
|
|
|
|
?
|
|
|
|
|
|
|
|
_patientSearchFormValues.setLastName = "0"
|
|
|
|
: _patientSearchFormValues.setLastName =
|
|
|
|
: _patientSearchFormValues.setLastName =
|
|
|
|
value;
|
|
|
|
value;
|
|
|
|
if (value.toString().trim().isEmpty) {
|
|
|
|
if (value
|
|
|
|
|
|
|
|
.toString()
|
|
|
|
|
|
|
|
.trim()
|
|
|
|
|
|
|
|
.isEmpty) {
|
|
|
|
_patientSearchFormValues.setLastName = "0";
|
|
|
|
_patientSearchFormValues.setLastName = "0";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
},
|
|
|
|
},
|
|
|
|
inputFormatter: ONLY_LETTERS),
|
|
|
|
inputFormatter: ONLY_LETTERS),
|
|
|
|
|
|
|
|
),
|
|
|
|
SizedBox(
|
|
|
|
SizedBox(
|
|
|
|
height: 10,
|
|
|
|
height: 10,
|
|
|
|
),
|
|
|
|
),
|
|
|
|
AppTextFormField(
|
|
|
|
Container(
|
|
|
|
|
|
|
|
decoration: BoxDecoration(
|
|
|
|
|
|
|
|
borderRadius: BorderRadius.all(
|
|
|
|
|
|
|
|
Radius.circular(6.0)),
|
|
|
|
|
|
|
|
border: Border.all(
|
|
|
|
|
|
|
|
width: 1.0, color: Hexcolor("#CCCCCC"))
|
|
|
|
|
|
|
|
),
|
|
|
|
|
|
|
|
padding: EdgeInsets.only(top: 5),
|
|
|
|
|
|
|
|
child: AppTextFormField(
|
|
|
|
|
|
|
|
labelText: TranslationBase
|
|
|
|
|
|
|
|
.of(context)
|
|
|
|
|
|
|
|
.phoneNumber,
|
|
|
|
|
|
|
|
borderColor: Colors.white,
|
|
|
|
textInputType: TextInputType.number,
|
|
|
|
textInputType: TextInputType.number,
|
|
|
|
hintText: TranslationBase.of(context).phoneNumber,
|
|
|
|
|
|
|
|
// validator: (value) {
|
|
|
|
|
|
|
|
// return TextValidator().validateMobile(value);
|
|
|
|
|
|
|
|
// },
|
|
|
|
|
|
|
|
inputFormatter: ONLY_NUMBERS,
|
|
|
|
inputFormatter: ONLY_NUMBERS,
|
|
|
|
onSaved: (value) {
|
|
|
|
onSaved: (value) {
|
|
|
|
value == null
|
|
|
|
value == null
|
|
|
@ -294,44 +376,68 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
|
|
|
|
: _patientSearchFormValues
|
|
|
|
: _patientSearchFormValues
|
|
|
|
.setPatientMobileNumber = value;
|
|
|
|
.setPatientMobileNumber = value;
|
|
|
|
|
|
|
|
|
|
|
|
if (value.toString().trim().isEmpty) {
|
|
|
|
if (value
|
|
|
|
|
|
|
|
.toString()
|
|
|
|
|
|
|
|
.trim()
|
|
|
|
|
|
|
|
.isEmpty) {
|
|
|
|
_patientSearchFormValues
|
|
|
|
_patientSearchFormValues
|
|
|
|
.setPatientMobileNumber = "0";
|
|
|
|
.setPatientMobileNumber = "0";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
},
|
|
|
|
},
|
|
|
|
),
|
|
|
|
),
|
|
|
|
|
|
|
|
),
|
|
|
|
SizedBox(
|
|
|
|
SizedBox(
|
|
|
|
height: 10,
|
|
|
|
height: 10,
|
|
|
|
),
|
|
|
|
),
|
|
|
|
AppTextFormField(
|
|
|
|
Container(
|
|
|
|
|
|
|
|
decoration: BoxDecoration(
|
|
|
|
|
|
|
|
borderRadius: BorderRadius.all(
|
|
|
|
|
|
|
|
Radius.circular(6.0)),
|
|
|
|
|
|
|
|
border: Border.all(
|
|
|
|
|
|
|
|
width: 1.0, color: Hexcolor("#CCCCCC"))
|
|
|
|
|
|
|
|
),
|
|
|
|
|
|
|
|
padding: EdgeInsets.only(top: 5),
|
|
|
|
|
|
|
|
child: AppTextFormField(
|
|
|
|
|
|
|
|
labelText: TranslationBase
|
|
|
|
|
|
|
|
.of(context)
|
|
|
|
|
|
|
|
.patientID,
|
|
|
|
|
|
|
|
borderColor: Colors.white,
|
|
|
|
textInputType: TextInputType.number,
|
|
|
|
textInputType: TextInputType.number,
|
|
|
|
hintText: TranslationBase.of(context).patientID,
|
|
|
|
|
|
|
|
//
|
|
|
|
|
|
|
|
inputFormatter: ONLY_NUMBERS,
|
|
|
|
inputFormatter: ONLY_NUMBERS,
|
|
|
|
onSaved: (value) {
|
|
|
|
onSaved: (value) {
|
|
|
|
// _patientSearchFormValues.PatientID = 89000;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
value == null
|
|
|
|
value == null
|
|
|
|
? _patientSearchFormValues.setPatientID = 0
|
|
|
|
?
|
|
|
|
|
|
|
|
_patientSearchFormValues.setPatientID = 0
|
|
|
|
: _patientSearchFormValues.setPatientID =
|
|
|
|
: _patientSearchFormValues.setPatientID =
|
|
|
|
int.parse(value);
|
|
|
|
int.parse(value);
|
|
|
|
if (value.toString().trim().isEmpty) {
|
|
|
|
if (value
|
|
|
|
|
|
|
|
.toString()
|
|
|
|
|
|
|
|
.trim()
|
|
|
|
|
|
|
|
.isEmpty) {
|
|
|
|
_patientSearchFormValues.setPatientID = 0;
|
|
|
|
_patientSearchFormValues.setPatientID = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}),
|
|
|
|
}),
|
|
|
|
|
|
|
|
),
|
|
|
|
SizedBox(
|
|
|
|
SizedBox(
|
|
|
|
height: 10,
|
|
|
|
height: 10,
|
|
|
|
),
|
|
|
|
),
|
|
|
|
AppTextFormField(
|
|
|
|
Container(
|
|
|
|
|
|
|
|
decoration: BoxDecoration(
|
|
|
|
|
|
|
|
borderRadius: BorderRadius.all(
|
|
|
|
|
|
|
|
Radius.circular(6.0)),
|
|
|
|
|
|
|
|
border: Border.all(
|
|
|
|
|
|
|
|
width: 1.0, color: Hexcolor("#CCCCCC"))
|
|
|
|
|
|
|
|
),
|
|
|
|
|
|
|
|
padding: EdgeInsets.only(top: 5),
|
|
|
|
|
|
|
|
child: AppTextFormField(
|
|
|
|
|
|
|
|
labelText: TranslationBase
|
|
|
|
|
|
|
|
.of(context)
|
|
|
|
|
|
|
|
.patientFile,
|
|
|
|
|
|
|
|
borderColor: Colors.white,
|
|
|
|
textInputType: TextInputType.number,
|
|
|
|
textInputType: TextInputType.number,
|
|
|
|
hintText: TranslationBase.of(context).patientFile,
|
|
|
|
|
|
|
|
// validator: (value) {
|
|
|
|
|
|
|
|
// return TextValidator().validateIdNumber(value);
|
|
|
|
|
|
|
|
// },
|
|
|
|
|
|
|
|
inputFormatter: ONLY_NUMBERS,
|
|
|
|
inputFormatter: ONLY_NUMBERS,
|
|
|
|
onSaved: (value) {
|
|
|
|
onSaved: (value) {},
|
|
|
|
//_patientSearchFormValues. = value;
|
|
|
|
),
|
|
|
|
},
|
|
|
|
|
|
|
|
),
|
|
|
|
),
|
|
|
|
(!(_selectedType == '2' || _selectedType == '4'))
|
|
|
|
(!(_selectedType == '2' || _selectedType == '4'))
|
|
|
|
? DynamicElements(_patientSearchFormValues)
|
|
|
|
? DynamicElements(_patientSearchFormValues)
|
|
|
@ -342,18 +448,15 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
|
|
|
|
height: 10,
|
|
|
|
height: 10,
|
|
|
|
),
|
|
|
|
),
|
|
|
|
Container(
|
|
|
|
Container(
|
|
|
|
// margin: 0,
|
|
|
|
height: 40.0,
|
|
|
|
// showBorder: true,
|
|
|
|
|
|
|
|
// raduis: 30,
|
|
|
|
|
|
|
|
// borderColor: Color(0xff707070),
|
|
|
|
|
|
|
|
decoration: ShapeDecoration(
|
|
|
|
decoration: ShapeDecoration(
|
|
|
|
shape: RoundedRectangleBorder(
|
|
|
|
shape: RoundedRectangleBorder(
|
|
|
|
side: BorderSide(
|
|
|
|
side: BorderSide(
|
|
|
|
width: 1.0,
|
|
|
|
width: 1.0,
|
|
|
|
style: BorderStyle.solid,
|
|
|
|
style: BorderStyle.solid,
|
|
|
|
color: Color(0xff707070)),
|
|
|
|
color: Hexcolor("#CCCCCC")),
|
|
|
|
borderRadius:
|
|
|
|
borderRadius:
|
|
|
|
BorderRadius.all(Radius.circular(5.0)),
|
|
|
|
BorderRadius.all(Radius.circular(6.0)),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
width: double.infinity,
|
|
|
|
width: double.infinity,
|
|
|
@ -372,7 +475,7 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
|
|
|
|
child: DropdownButton(
|
|
|
|
child: DropdownButton(
|
|
|
|
isExpanded: true,
|
|
|
|
isExpanded: true,
|
|
|
|
value: _selectedLocation,
|
|
|
|
value: _selectedLocation,
|
|
|
|
iconSize: 40,
|
|
|
|
iconSize: 25,
|
|
|
|
elevation: 16,
|
|
|
|
elevation: 16,
|
|
|
|
selectedItemBuilder:
|
|
|
|
selectedItemBuilder:
|
|
|
|
(BuildContext context) {
|
|
|
|
(BuildContext context) {
|
|
|
@ -420,18 +523,36 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
|
|
|
|
),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
|
|
|
|
SizedBox(
|
|
|
|
|
|
|
|
height: 10,
|
|
|
|
|
|
|
|
),
|
|
|
|
Container(
|
|
|
|
Container(
|
|
|
|
child: Row(
|
|
|
|
child: Row(
|
|
|
|
mainAxisAlignment: MainAxisAlignment.start,
|
|
|
|
mainAxisAlignment: MainAxisAlignment.start,
|
|
|
|
children: <Widget>[
|
|
|
|
children: <Widget>[
|
|
|
|
Checkbox(
|
|
|
|
Container(
|
|
|
|
|
|
|
|
decoration: BoxDecoration(
|
|
|
|
|
|
|
|
borderRadius: BorderRadius.all(
|
|
|
|
|
|
|
|
Radius.circular(6.0)),
|
|
|
|
|
|
|
|
border: Border.all(
|
|
|
|
|
|
|
|
width: 1.0,
|
|
|
|
|
|
|
|
color: Hexcolor("#CCCCCC"))
|
|
|
|
|
|
|
|
),
|
|
|
|
|
|
|
|
height: 25,
|
|
|
|
|
|
|
|
width: 25,
|
|
|
|
|
|
|
|
child: Checkbox(
|
|
|
|
value: true,
|
|
|
|
value: true,
|
|
|
|
activeColor: Color(0xffFFDDD9),
|
|
|
|
checkColor: Hexcolor("#2A930A"),
|
|
|
|
|
|
|
|
activeColor: Colors.white,
|
|
|
|
onChanged: (bool newValue) {}),
|
|
|
|
onChanged: (bool newValue) {}),
|
|
|
|
|
|
|
|
),
|
|
|
|
|
|
|
|
SizedBox(width: 12,),
|
|
|
|
AppText(
|
|
|
|
AppText(
|
|
|
|
TranslationBase.of(context)
|
|
|
|
TranslationBase
|
|
|
|
|
|
|
|
.of(context)
|
|
|
|
.onlyArrivedPatient,
|
|
|
|
.onlyArrivedPatient,
|
|
|
|
fontSize: SizeConfig.textMultiplier * 2),
|
|
|
|
fontSize: SizeConfig.textMultiplier *
|
|
|
|
|
|
|
|
2),
|
|
|
|
])),
|
|
|
|
])),
|
|
|
|
SizedBox(
|
|
|
|
SizedBox(
|
|
|
|
height: 10,
|
|
|
|
height: 10,
|
|
|
@ -450,7 +571,6 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
|
|
|
|
children: <Widget>[
|
|
|
|
children: <Widget>[
|
|
|
|
AppButton(
|
|
|
|
AppButton(
|
|
|
|
title: TranslationBase.of(context).search,
|
|
|
|
title: TranslationBase.of(context).search,
|
|
|
|
color: Color(0xff58434F),
|
|
|
|
|
|
|
|
onPressed: () {
|
|
|
|
onPressed: () {
|
|
|
|
_validateInputs();
|
|
|
|
_validateInputs();
|
|
|
|
},
|
|
|
|
},
|
|
|
|