|
|
|
@ -140,7 +140,9 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
|
|
|
|
Padding(
|
|
|
|
Padding(
|
|
|
|
padding: const EdgeInsets.only(top: 12.0),
|
|
|
|
padding: const EdgeInsets.only(top: 12.0),
|
|
|
|
child: AppText(
|
|
|
|
child: AppText(
|
|
|
|
TranslationBase.of(context).searchPatientImageCaptionTitle.toUpperCase(),
|
|
|
|
TranslationBase.of(context)
|
|
|
|
|
|
|
|
.searchPatientImageCaptionTitle
|
|
|
|
|
|
|
|
.toUpperCase(),
|
|
|
|
fontWeight: FontWeight.bold,
|
|
|
|
fontWeight: FontWeight.bold,
|
|
|
|
fontSize: SizeConfig.heightMultiplier * 2.5,
|
|
|
|
fontSize: SizeConfig.heightMultiplier * 2.5,
|
|
|
|
),
|
|
|
|
),
|
|
|
|
@ -155,7 +157,6 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
|
|
|
|
)
|
|
|
|
)
|
|
|
|
],
|
|
|
|
],
|
|
|
|
),
|
|
|
|
),
|
|
|
|
|
|
|
|
|
|
|
|
Container(
|
|
|
|
Container(
|
|
|
|
padding: EdgeInsets.all(15),
|
|
|
|
padding: EdgeInsets.all(15),
|
|
|
|
width: SizeConfig.screenWidth * 1,
|
|
|
|
width: SizeConfig.screenWidth * 1,
|
|
|
|
@ -180,7 +181,6 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
|
|
|
|
BorderRadius.all(Radius.circular(6.0)),
|
|
|
|
BorderRadius.all(Radius.circular(6.0)),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
|
|
|
|
|
|
|
|
width: double.infinity,
|
|
|
|
width: double.infinity,
|
|
|
|
child: Padding(
|
|
|
|
child: Padding(
|
|
|
|
padding: EdgeInsets.only(
|
|
|
|
padding: EdgeInsets.only(
|
|
|
|
@ -222,8 +222,7 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
|
|
|
|
);
|
|
|
|
);
|
|
|
|
}).toList();
|
|
|
|
}).toList();
|
|
|
|
},
|
|
|
|
},
|
|
|
|
onChanged: (String newValue) =>
|
|
|
|
onChanged: (String newValue) => {
|
|
|
|
{
|
|
|
|
|
|
|
|
setState(() {
|
|
|
|
setState(() {
|
|
|
|
_selectedType = newValue;
|
|
|
|
_selectedType = newValue;
|
|
|
|
selectedPatientType =
|
|
|
|
selectedPatientType =
|
|
|
|
@ -253,19 +252,15 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
|
|
|
|
),
|
|
|
|
),
|
|
|
|
Container(
|
|
|
|
Container(
|
|
|
|
decoration: BoxDecoration(
|
|
|
|
decoration: BoxDecoration(
|
|
|
|
borderRadius: BorderRadius.all(
|
|
|
|
borderRadius:
|
|
|
|
Radius.circular(6.0)),
|
|
|
|
BorderRadius.all(Radius.circular(6.0)),
|
|
|
|
border: Border.all(
|
|
|
|
border: Border.all(
|
|
|
|
width: 1.0, color: Hexcolor("#CCCCCC"))
|
|
|
|
width: 1.0, color: Hexcolor("#CCCCCC"))),
|
|
|
|
),
|
|
|
|
|
|
|
|
padding: EdgeInsets.only(top: 5),
|
|
|
|
padding: EdgeInsets.only(top: 5),
|
|
|
|
child: AppTextFormField(
|
|
|
|
child: AppTextFormField(
|
|
|
|
|
|
|
|
labelText:
|
|
|
|
labelText: TranslationBase
|
|
|
|
TranslationBase.of(context).firstName,
|
|
|
|
.of(context)
|
|
|
|
|
|
|
|
.firstName,
|
|
|
|
|
|
|
|
borderColor: Colors.white,
|
|
|
|
borderColor: Colors.white,
|
|
|
|
|
|
|
|
|
|
|
|
onSaved: (value) {
|
|
|
|
onSaved: (value) {
|
|
|
|
value == null
|
|
|
|
value == null
|
|
|
|
? _patientSearchFormValues.setFirstName =
|
|
|
|
? _patientSearchFormValues.setFirstName =
|
|
|
|
@ -273,10 +268,7 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
|
|
|
|
: _patientSearchFormValues.setFirstName =
|
|
|
|
: _patientSearchFormValues.setFirstName =
|
|
|
|
value;
|
|
|
|
value;
|
|
|
|
|
|
|
|
|
|
|
|
if (value
|
|
|
|
if (value.toString().trim().isEmpty) {
|
|
|
|
.toString()
|
|
|
|
|
|
|
|
.trim()
|
|
|
|
|
|
|
|
.isEmpty) {
|
|
|
|
|
|
|
|
_patientSearchFormValues.setFirstName = "0";
|
|
|
|
_patientSearchFormValues.setFirstName = "0";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
},
|
|
|
|
},
|
|
|
|
@ -290,16 +282,14 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
|
|
|
|
),
|
|
|
|
),
|
|
|
|
Container(
|
|
|
|
Container(
|
|
|
|
decoration: BoxDecoration(
|
|
|
|
decoration: BoxDecoration(
|
|
|
|
borderRadius: BorderRadius.all(
|
|
|
|
borderRadius:
|
|
|
|
Radius.circular(6.0)),
|
|
|
|
BorderRadius.all(Radius.circular(6.0)),
|
|
|
|
border: Border.all(
|
|
|
|
border: Border.all(
|
|
|
|
width: 1.0, color: Hexcolor("#CCCCCC"))
|
|
|
|
width: 1.0, color: Hexcolor("#CCCCCC"))),
|
|
|
|
),
|
|
|
|
|
|
|
|
padding: EdgeInsets.only(top: 5),
|
|
|
|
padding: EdgeInsets.only(top: 5),
|
|
|
|
child: AppTextFormField(
|
|
|
|
child: AppTextFormField(
|
|
|
|
labelText: TranslationBase
|
|
|
|
labelText:
|
|
|
|
.of(context)
|
|
|
|
TranslationBase.of(context).middleName,
|
|
|
|
.middleName,
|
|
|
|
|
|
|
|
borderColor: Colors.white,
|
|
|
|
borderColor: Colors.white,
|
|
|
|
onSaved: (value) {
|
|
|
|
onSaved: (value) {
|
|
|
|
value == null
|
|
|
|
value == null
|
|
|
|
@ -307,10 +297,7 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
|
|
|
|
"0"
|
|
|
|
"0"
|
|
|
|
: _patientSearchFormValues.setMiddleName =
|
|
|
|
: _patientSearchFormValues.setMiddleName =
|
|
|
|
value;
|
|
|
|
value;
|
|
|
|
if (value
|
|
|
|
if (value.toString().trim().isEmpty) {
|
|
|
|
.toString()
|
|
|
|
|
|
|
|
.trim()
|
|
|
|
|
|
|
|
.isEmpty) {
|
|
|
|
|
|
|
|
_patientSearchFormValues.setMiddleName =
|
|
|
|
_patientSearchFormValues.setMiddleName =
|
|
|
|
"0";
|
|
|
|
"0";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -325,27 +312,21 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
|
|
|
|
),
|
|
|
|
),
|
|
|
|
Container(
|
|
|
|
Container(
|
|
|
|
decoration: BoxDecoration(
|
|
|
|
decoration: BoxDecoration(
|
|
|
|
borderRadius: BorderRadius.all(
|
|
|
|
borderRadius:
|
|
|
|
Radius.circular(6.0)),
|
|
|
|
BorderRadius.all(Radius.circular(6.0)),
|
|
|
|
border: Border.all(
|
|
|
|
border: Border.all(
|
|
|
|
width: 1.0, color: Hexcolor("#CCCCCC"))
|
|
|
|
width: 1.0, color: Hexcolor("#CCCCCC"))),
|
|
|
|
),
|
|
|
|
|
|
|
|
padding: EdgeInsets.only(top: 5),
|
|
|
|
padding: EdgeInsets.only(top: 5),
|
|
|
|
child: AppTextFormField(
|
|
|
|
child: AppTextFormField(
|
|
|
|
labelText: TranslationBase
|
|
|
|
labelText: TranslationBase.of(context).lastName,
|
|
|
|
.of(context)
|
|
|
|
|
|
|
|
.lastName,
|
|
|
|
|
|
|
|
borderColor: Colors.white,
|
|
|
|
borderColor: Colors.white,
|
|
|
|
onSaved: (value) {
|
|
|
|
onSaved: (value) {
|
|
|
|
value == null
|
|
|
|
value == null
|
|
|
|
?
|
|
|
|
? _patientSearchFormValues.setLastName =
|
|
|
|
_patientSearchFormValues.setLastName = "0"
|
|
|
|
"0"
|
|
|
|
: _patientSearchFormValues.setLastName =
|
|
|
|
: _patientSearchFormValues.setLastName =
|
|
|
|
value;
|
|
|
|
value;
|
|
|
|
if (value
|
|
|
|
if (value.toString().trim().isEmpty) {
|
|
|
|
.toString()
|
|
|
|
|
|
|
|
.trim()
|
|
|
|
|
|
|
|
.isEmpty) {
|
|
|
|
|
|
|
|
_patientSearchFormValues.setLastName = "0";
|
|
|
|
_patientSearchFormValues.setLastName = "0";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
},
|
|
|
|
},
|
|
|
|
@ -356,16 +337,14 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
|
|
|
|
),
|
|
|
|
),
|
|
|
|
Container(
|
|
|
|
Container(
|
|
|
|
decoration: BoxDecoration(
|
|
|
|
decoration: BoxDecoration(
|
|
|
|
borderRadius: BorderRadius.all(
|
|
|
|
borderRadius:
|
|
|
|
Radius.circular(6.0)),
|
|
|
|
BorderRadius.all(Radius.circular(6.0)),
|
|
|
|
border: Border.all(
|
|
|
|
border: Border.all(
|
|
|
|
width: 1.0, color: Hexcolor("#CCCCCC"))
|
|
|
|
width: 1.0, color: Hexcolor("#CCCCCC"))),
|
|
|
|
),
|
|
|
|
|
|
|
|
padding: EdgeInsets.only(top: 5),
|
|
|
|
padding: EdgeInsets.only(top: 5),
|
|
|
|
child: AppTextFormField(
|
|
|
|
child: AppTextFormField(
|
|
|
|
labelText: TranslationBase
|
|
|
|
labelText:
|
|
|
|
.of(context)
|
|
|
|
TranslationBase.of(context).phoneNumber,
|
|
|
|
.phoneNumber,
|
|
|
|
|
|
|
|
borderColor: Colors.white,
|
|
|
|
borderColor: Colors.white,
|
|
|
|
textInputType: TextInputType.number,
|
|
|
|
textInputType: TextInputType.number,
|
|
|
|
inputFormatter: ONLY_NUMBERS,
|
|
|
|
inputFormatter: ONLY_NUMBERS,
|
|
|
|
@ -376,10 +355,7 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
|
|
|
|
: _patientSearchFormValues
|
|
|
|
: _patientSearchFormValues
|
|
|
|
.setPatientMobileNumber = value;
|
|
|
|
.setPatientMobileNumber = value;
|
|
|
|
|
|
|
|
|
|
|
|
if (value
|
|
|
|
if (value.toString().trim().isEmpty) {
|
|
|
|
.toString()
|
|
|
|
|
|
|
|
.trim()
|
|
|
|
|
|
|
|
.isEmpty) {
|
|
|
|
|
|
|
|
_patientSearchFormValues
|
|
|
|
_patientSearchFormValues
|
|
|
|
.setPatientMobileNumber = "0";
|
|
|
|
.setPatientMobileNumber = "0";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -391,29 +367,24 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
|
|
|
|
),
|
|
|
|
),
|
|
|
|
Container(
|
|
|
|
Container(
|
|
|
|
decoration: BoxDecoration(
|
|
|
|
decoration: BoxDecoration(
|
|
|
|
borderRadius: BorderRadius.all(
|
|
|
|
borderRadius:
|
|
|
|
Radius.circular(6.0)),
|
|
|
|
BorderRadius.all(Radius.circular(6.0)),
|
|
|
|
border: Border.all(
|
|
|
|
border: Border.all(
|
|
|
|
width: 1.0, color: Hexcolor("#CCCCCC"))
|
|
|
|
width: 1.0, color: Hexcolor("#CCCCCC"))),
|
|
|
|
),
|
|
|
|
|
|
|
|
padding: EdgeInsets.only(top: 5),
|
|
|
|
padding: EdgeInsets.only(top: 5),
|
|
|
|
child: AppTextFormField(
|
|
|
|
child: AppTextFormField(
|
|
|
|
labelText: TranslationBase
|
|
|
|
labelText:
|
|
|
|
.of(context)
|
|
|
|
TranslationBase.of(context).patientID,
|
|
|
|
.patientID,
|
|
|
|
|
|
|
|
borderColor: Colors.white,
|
|
|
|
borderColor: Colors.white,
|
|
|
|
textInputType: TextInputType.number,
|
|
|
|
textInputType: TextInputType.number,
|
|
|
|
inputFormatter: ONLY_NUMBERS,
|
|
|
|
inputFormatter: ONLY_NUMBERS,
|
|
|
|
onSaved: (value) {
|
|
|
|
onSaved: (value) {
|
|
|
|
value == null
|
|
|
|
value == null
|
|
|
|
?
|
|
|
|
? _patientSearchFormValues.setPatientID =
|
|
|
|
_patientSearchFormValues.setPatientID = 0
|
|
|
|
0
|
|
|
|
: _patientSearchFormValues.setPatientID =
|
|
|
|
: _patientSearchFormValues.setPatientID =
|
|
|
|
int.parse(value);
|
|
|
|
int.parse(value);
|
|
|
|
if (value
|
|
|
|
if (value.toString().trim().isEmpty) {
|
|
|
|
.toString()
|
|
|
|
|
|
|
|
.trim()
|
|
|
|
|
|
|
|
.isEmpty) {
|
|
|
|
|
|
|
|
_patientSearchFormValues.setPatientID = 0;
|
|
|
|
_patientSearchFormValues.setPatientID = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}),
|
|
|
|
}),
|
|
|
|
@ -423,16 +394,14 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
|
|
|
|
),
|
|
|
|
),
|
|
|
|
Container(
|
|
|
|
Container(
|
|
|
|
decoration: BoxDecoration(
|
|
|
|
decoration: BoxDecoration(
|
|
|
|
borderRadius: BorderRadius.all(
|
|
|
|
borderRadius:
|
|
|
|
Radius.circular(6.0)),
|
|
|
|
BorderRadius.all(Radius.circular(6.0)),
|
|
|
|
border: Border.all(
|
|
|
|
border: Border.all(
|
|
|
|
width: 1.0, color: Hexcolor("#CCCCCC"))
|
|
|
|
width: 1.0, color: Hexcolor("#CCCCCC"))),
|
|
|
|
),
|
|
|
|
|
|
|
|
padding: EdgeInsets.only(top: 5),
|
|
|
|
padding: EdgeInsets.only(top: 5),
|
|
|
|
child: AppTextFormField(
|
|
|
|
child: AppTextFormField(
|
|
|
|
labelText: TranslationBase
|
|
|
|
labelText:
|
|
|
|
.of(context)
|
|
|
|
TranslationBase.of(context).patientFile,
|
|
|
|
.patientFile,
|
|
|
|
|
|
|
|
borderColor: Colors.white,
|
|
|
|
borderColor: Colors.white,
|
|
|
|
textInputType: TextInputType.number,
|
|
|
|
textInputType: TextInputType.number,
|
|
|
|
inputFormatter: ONLY_NUMBERS,
|
|
|
|
inputFormatter: ONLY_NUMBERS,
|
|
|
|
@ -536,8 +505,7 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
|
|
|
|
Radius.circular(6.0)),
|
|
|
|
Radius.circular(6.0)),
|
|
|
|
border: Border.all(
|
|
|
|
border: Border.all(
|
|
|
|
width: 1.0,
|
|
|
|
width: 1.0,
|
|
|
|
color: Hexcolor("#CCCCCC"))
|
|
|
|
color: Hexcolor("#CCCCCC"))),
|
|
|
|
),
|
|
|
|
|
|
|
|
height: 25,
|
|
|
|
height: 25,
|
|
|
|
width: 25,
|
|
|
|
width: 25,
|
|
|
|
child: Checkbox(
|
|
|
|
child: Checkbox(
|
|
|
|
@ -546,13 +514,13 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
|
|
|
|
activeColor: Colors.white,
|
|
|
|
activeColor: Colors.white,
|
|
|
|
onChanged: (bool newValue) {}),
|
|
|
|
onChanged: (bool newValue) {}),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
SizedBox(width: 12,),
|
|
|
|
SizedBox(
|
|
|
|
|
|
|
|
width: 12,
|
|
|
|
|
|
|
|
),
|
|
|
|
AppText(
|
|
|
|
AppText(
|
|
|
|
TranslationBase
|
|
|
|
TranslationBase.of(context)
|
|
|
|
.of(context)
|
|
|
|
|
|
|
|
.onlyArrivedPatient,
|
|
|
|
.onlyArrivedPatient,
|
|
|
|
fontSize: SizeConfig.textMultiplier *
|
|
|
|
fontSize: SizeConfig.textMultiplier * 2),
|
|
|
|
2),
|
|
|
|
|
|
|
|
])),
|
|
|
|
])),
|
|
|
|
SizedBox(
|
|
|
|
SizedBox(
|
|
|
|
height: 10,
|
|
|
|
height: 10,
|
|
|
|
|