Merge branch 'sultan' into 'development'

Sultan

See merge request Cloud_Solution/doctor_app_flutter!373
merge-requests/374/merge
Mohammad Aljammal 5 years ago
commit fe57ce7f7c

@ -129,6 +129,8 @@ class PatientService extends BaseService {
"SessionID": patient.SessionID,
"IsLoginForDoctorApp": patient.IsLoginForDoctorApp,
"PatientOutSA": patient.PatientOutSA,
"SearchType": patient.Searchtype,
"MobileNo": ''
},
);

@ -3,7 +3,7 @@
class PatiantInformtion {
final List<PatiantInformtion> list;
int genderInt;
String age;
dynamic age;
String appointmentDate;
int appointmentNo;
String appointmentType;

@ -443,38 +443,6 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
},
inputFormatter: ONLY_LETTERS),
),
// SizedBox(
// height: 10,
// ),
// Container(
// decoration: BoxDecoration(
// borderRadius: BorderRadius.all(
// Radius.circular(6.0)),
// border: Border.all(
// width: 1.0,
// color: HexColor("#CCCCCC"))),
// padding: EdgeInsets.all(10),
// child: AppTextFormField(
// labelText: TranslationBase.of(context)
// .patientID,
// borderColor: Colors.white,
// textInputType: TextInputType.number,
// inputFormatter: ONLY_NUMBERS,
// focusNode: _nodeText2,
// onSaved: (value) {
// value == null || value == ''
// ? _patientSearchFormValues
// .setPatientID = 0
// : _patientSearchFormValues
// .setPatientID =
// int.parse(value);
// if (value != null &&
// value.trim().toString().isEmpty) {
// _patientSearchFormValues
// .setPatientID = 0;
// }
// }),
// ),
SizedBox(
height: 10,
),
@ -487,23 +455,55 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
color: HexColor("#CCCCCC"))),
padding: EdgeInsets.all(10),
child: AppTextFormField(
labelText: TranslationBase.of(context)
.patientFile,
borderColor: Colors.white,
textInputType: TextInputType.number,
focusNode: _nodeText3,
inputFormatter: ONLY_NUMBERS,
onSaved: (value) {},
),
labelText: TranslationBase.of(context)
.patientID,
borderColor: Colors.white,
textInputType: TextInputType.number,
inputFormatter: ONLY_NUMBERS,
focusNode: _nodeText2,
onSaved: (value) {
value == null || value == ''
? _patientSearchFormValues
.setPatientID = 0
: _patientSearchFormValues
.setPatientID =
int.parse(value);
if (value != null &&
value.trim().toString().isEmpty) {
_patientSearchFormValues
.setPatientID = 0;
}
}),
),
(!(_selectedType == '2' ||
_selectedType == '4'))
? DynamicElements(
_patientSearchFormValues,
isFormSubmitted)
: SizedBox(
height: 0,
),
SizedBox(
height: 10,
),
// Container(
// decoration: BoxDecoration(
// borderRadius: BorderRadius.all(
// Radius.circular(6.0)),
// border: Border.all(
// width: 1.0,
// color: HexColor("#CCCCCC"))),
// padding: EdgeInsets.all(10),
// child: AppTextFormField(
// labelText: TranslationBase.of(context)
// .patientFile,
// borderColor: Colors.white,
// textInputType: TextInputType.number,
// focusNode: _nodeText3,
// inputFormatter: ONLY_NUMBERS,
// onSaved: (value) {},
// ),
// ),
// (!(_selectedType == '2' ||
// _selectedType == '4'))
// ? DynamicElements(
// _patientSearchFormValues,
// isFormSubmitted)
// : SizedBox(
// height: 0,
// ),
SizedBox(
height: 10,
),

@ -295,8 +295,9 @@ class _PatientsScreenState extends State<PatientsScreen> {
} else {
if (isView == false && val2 == 1) {
lItems = res['GetPatientFileInformation_PRMList'];
} else {
lItems = res[SERVICES_PATIANT2[val2]];
}
lItems = res[SERVICES_PATIANT2[val2]];
}
parsed = lItems;
responseModelList = new ModelResponse.fromJson(parsed).list;

Loading…
Cancel
Save