Updates & fixes

merge-update-with-lab-changes
haroon amjad 5 years ago
parent 8e7786cb96
commit 45272d251c

@ -48,8 +48,10 @@ class AppointmentRateService extends BaseService {
appointmentRate.doctorID = doctorID; appointmentRate.doctorID = doctorID;
appointmentRate.clinicID = clinicID; appointmentRate.clinicID = clinicID;
appointmentRate.note = note; appointmentRate.note = note;
appointmentRate.createdBy = 2;
appointmentRate.editedBy = 2;
await baseAppClient.post(GET_APPOINTMENT_DETAILS_BY_NO, await baseAppClient.post(NEW_RATE_APPOINTMENT_URL,
onSuccess: (dynamic response, int statusCode) {}, onSuccess: (dynamic response, int statusCode) {},
onFailure: (String error, int statusCode) { onFailure: (String error, int statusCode) {
hasError = true; hasError = true;

@ -53,6 +53,7 @@ class _DentalComplaintsState extends State<DentalComplaints> {
appBarTitle: "Symptoms", appBarTitle: "Symptoms",
showNewAppBar: true, showNewAppBar: true,
showNewAppBarTitle: true, showNewAppBarTitle: true,
isShowDecPage: false,
backgroundColor: CustomColors.appBackgroudGreyColor, backgroundColor: CustomColors.appBackgroudGreyColor,
body: Container( body: Container(
child: !hasDentalPlan child: !hasDentalPlan

@ -173,7 +173,7 @@ class _SearchByClinicState extends State<SearchByClinic> {
), ),
), ),
Text( Text(
"30", projectViewModel.isLogin ? projectViewModel.user.age.toString() : "",
style: TextStyle( style: TextStyle(
fontSize: 15, fontSize: 15,
letterSpacing: -0.59, letterSpacing: -0.59,
@ -251,6 +251,9 @@ class _SearchByClinicState extends State<SearchByClinic> {
height: 18, height: 18,
child: DropdownButtonHideUnderline( child: DropdownButtonHideUnderline(
child: DropdownButton<String>( child: DropdownButton<String>(
onTap: () {
print("Clicked");
},
key: clinicDropdownKey, key: clinicDropdownKey,
hint: new Text( hint: new Text(
TranslationBase.of(context).selectClinic, TranslationBase.of(context).selectClinic,
@ -270,6 +273,9 @@ class _SearchByClinicState extends State<SearchByClinic> {
item.liveCareServiceID.toString(), item.liveCareServiceID.toString(),
child: Row(mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ child: Row(mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [
Text(item.clinicDescription), Text(item.clinicDescription),
item.isLiveCareClinicAndOnline
? SvgPicture.asset('assets/images/new-design/video_icon_green_right.svg', height: 12, width: 12, fit: BoxFit.cover)
: Container(),
]), ]),
); );
}).toList(), }).toList(),
@ -448,8 +454,10 @@ class _SearchByClinicState extends State<SearchByClinic> {
page: LiveCareBookAppointment(clinicName: "Family Medicine", liveCareClinicID: dropdownValue.split("-")[2], liveCareServiceID: dropdownValue.split("-")[3]), page: LiveCareBookAppointment(clinicName: "Family Medicine", liveCareClinicID: dropdownValue.split("-")[2], liveCareServiceID: dropdownValue.split("-")[3]),
), ),
).then((value) { ).then((value) {
print(value); setState(() {
if (value == "false") dropdownValue = ""; print(value);
if (value == "false") dropdownValue = null;
});
if (value == "livecare") { if (value == "livecare") {
Navigator.push(context, FadePage(page: LiveCareHome())); Navigator.push(context, FadePage(page: LiveCareHome()));
} }
@ -517,13 +525,20 @@ class _SearchByClinicState extends State<SearchByClinic> {
FadePage( FadePage(
page: DentalComplaints(searchInfo: searchInfo), page: DentalComplaints(searchInfo: searchInfo),
), ),
); ).then((value) {
setState(() {
dropdownValue = null;
});
});
} }
Future navigateToSearchResults(context, List<DoctorList> docList, List<PatientDoctorAppointmentList> patientDoctorAppointmentListHospital) async { Future navigateToSearchResults(context, List<DoctorList> docList, List<PatientDoctorAppointmentList> patientDoctorAppointmentListHospital) async {
isProjectLoaded = false; isProjectLoaded = false;
Navigator.push(context, FadePage(page: SearchResults(isLiveCareAppointment: false, doctorsList: docList, patientDoctorAppointmentListHospital: patientDoctorAppointmentListHospital))) Navigator.push(context, FadePage(page: SearchResults(isLiveCareAppointment: false, doctorsList: docList, patientDoctorAppointmentListHospital: patientDoctorAppointmentListHospital)))
.then((value) { .then((value) {
setState(() {
dropdownValue = null;
});
getProjectsList(); getProjectsList();
}); });
} }

Loading…
Cancel
Save