Merge branch 'sultan' into 'development'

Sultan

See merge request Cloud_Solution/doctor_app_flutter!434
merge-requests/435/merge
Mohammad Aljammal 5 years ago
commit 2bd57bec05

@ -167,16 +167,24 @@ class _PatientsScreenState extends State<PatientsScreen> {
var strExist = str.length > 0 ? true : false; var strExist = str.length > 0 ? true : false;
if (true) { if (true) {
List<PatiantInformtion> filterDate = []; List<PatiantInformtion> filterDate = [];
String patiantAppointment = "";
for (var i = 0; i < responseModelList2.length; i++) { for (var i = 0; i < responseModelList2.length; i++) {
String patiantAppointment = try {
if (responseModelList[i].appointmentDate == "") {
patiantAppointment = responseModelList[i].arrivedOn;
} else {
patiantAppointment =
convertDateFormat(responseModelList[i].appointmentDate); convertDateFormat(responseModelList[i].appointmentDate);
}
String dateAppointment = checkDate(patiantAppointment); String dateAppointment = checkDate(patiantAppointment);
if (dateAppointment.contains(str)) { if (dateAppointment.contains(str)) {
filterDate.add(responseModelList[i]); filterDate.add(responseModelList[i]);
} }
} catch (e) {
print(e);
}
} }
setState(() { setState(() {
@ -446,11 +454,12 @@ class _PatientsScreenState extends State<PatientsScreen> {
.size .size
.height * .height *
0.03), 0.03),
child: SERVICES_PATIANT2[ child: _locationBar(context)
int.parse(patientType)] == // child: SERVICES_PATIANT2[
"List_MyOutPatient" // int.parse(patientType)] ==
? _locationBar(context) // "List_MyOutPatient"
: Container(), // ? _locationBar(context)
// : Container(),
), ),
// Row( // Row(
// mainAxisAlignment: // mainAxisAlignment:

Loading…
Cancel
Save