diff --git a/lib/core/service/contactus/livechat_service.dart b/lib/core/service/contactus/livechat_service.dart index ba4cc8b2..0029e1e9 100644 --- a/lib/core/service/contactus/livechat_service.dart +++ b/lib/core/service/contactus/livechat_service.dart @@ -1,4 +1,5 @@ import 'package:diplomaticquarterapp/config/config.dart'; +import 'package:diplomaticquarterapp/config/shared_pref_kay.dart'; import 'package:diplomaticquarterapp/core/model/contactus/get_patientI_cprojects.dart'; import '../base_service.dart'; @@ -12,6 +13,9 @@ class LiveChatService extends BaseService { Future getAllLiveChatOrders() async { hasError = false; body['List_PatientICProjects'] = false; + body['Latitude'] = await this.sharedPref.getDouble(USER_LAT); + body['Longitude'] = await this.sharedPref.getDouble(USER_LONG); + await baseAppClient.post(GET_LIVECHAT_REQUEST, onSuccess: (dynamic response, int statusCode) { LivechatModelList.clear(); diff --git a/lib/pages/ContactUs/LiveChat/hospitalsLivechat_page.dart b/lib/pages/ContactUs/LiveChat/hospitalsLivechat_page.dart index 2780d1d2..17f9b5db 100644 --- a/lib/pages/ContactUs/LiveChat/hospitalsLivechat_page.dart +++ b/lib/pages/ContactUs/LiveChat/hospitalsLivechat_page.dart @@ -45,7 +45,6 @@ class _HospitalsLiveChatPageState extends State { children: [ Text( TranslationBase.of(context).instructions, - textAlign: TextAlign.center, style: TextStyle(fontSize: 16, fontWeight: FontWeight.w600, color: Color(0xff2B353E), letterSpacing: -0.64, height: 23 / 16), ), SizedBox(height: 20), diff --git a/lib/pages/ContactUs/LiveChat/livechat_page.dart b/lib/pages/ContactUs/LiveChat/livechat_page.dart index d2b24e89..fb9c0b0b 100644 --- a/lib/pages/ContactUs/LiveChat/livechat_page.dart +++ b/lib/pages/ContactUs/LiveChat/livechat_page.dart @@ -45,7 +45,7 @@ class _LiveChatPageState extends State with SingleTickerProviderSt imagesInfo: imagesInfo, title: TranslationBase.of(context).liveChat, description: TranslationBase.of(context).infoChat, - appBarTitle: TranslationBase.of(context).service, + appBarTitle: TranslationBase.of(context).liveChat, showNewAppBar: true, showNewAppBarTitle: true, backgroundColor: CustomColors.appBackgroudGrey2Color, diff --git a/lib/pages/feedback/send_feedback_page.dart b/lib/pages/feedback/send_feedback_page.dart index c3af1577..daf5795c 100644 --- a/lib/pages/feedback/send_feedback_page.dart +++ b/lib/pages/feedback/send_feedback_page.dart @@ -161,7 +161,7 @@ class _SendFeedbackPageState extends State { }); }, child: DoctorCard( - onTap: () {}, + onTap: null, isInOutPatient: appointHistory.isInOutPatient, name: appointHistory.doctorTitle + " " + appointHistory.doctorNameObj, // billNo: _appointmentResult.invoiceNo, @@ -187,7 +187,7 @@ class _SendFeedbackPageState extends State { }); }, child: DoctorCard( - onTap: () {}, + onTap: null, isInOutPatient: model.appointHistoryList[index].isInOutPatient, name: model.appointHistoryList[index].doctorTitle + " " + model.appointHistoryList[index].doctorNameObj, profileUrl: model.appointHistoryList[index].doctorImageURL, diff --git a/lib/pages/insurance/insurance_approval_screen.dart b/lib/pages/insurance/insurance_approval_screen.dart index 886f641c..a88d89ab 100644 --- a/lib/pages/insurance/insurance_approval_screen.dart +++ b/lib/pages/insurance/insurance_approval_screen.dart @@ -150,7 +150,7 @@ class _InsuranceApprovalState extends State { height: 48, alignment: Alignment.bottomRight, child: Icon( - Icons.visibility_sharp, + Icons.arrow_forward, color: Color(0xff2E303A), ), ) diff --git a/lib/pages/medical/active_medications/ActiveMedicationsPage.dart b/lib/pages/medical/active_medications/ActiveMedicationsPage.dart index 8299cad0..87f5b0c4 100644 --- a/lib/pages/medical/active_medications/ActiveMedicationsPage.dart +++ b/lib/pages/medical/active_medications/ActiveMedicationsPage.dart @@ -24,7 +24,7 @@ class ActiveMedicationsPage extends StatelessWidget { isShowDecPage: true, baseViewModel: model, appBarTitle: TranslationBase.of(context).activeMedications, - body: Container( + body: model.activePrescriptionReport.length > 0 ? Container( child: ListView.builder( itemCount: model.activePrescriptionReport.length, itemBuilder: (context, index) => Container( @@ -197,7 +197,7 @@ class ActiveMedicationsPage extends StatelessWidget { ), ), ), - ), + ) : getNoDataWidget(context), ), ); } diff --git a/lib/pages/vaccine/my_vaccines_screen.dart b/lib/pages/vaccine/my_vaccines_screen.dart index a41c8c99..f15ee9fb 100644 --- a/lib/pages/vaccine/my_vaccines_screen.dart +++ b/lib/pages/vaccine/my_vaccines_screen.dart @@ -53,7 +53,7 @@ class _MyVaccinesState extends State { separatorBuilder: (context, index) => SizedBox(height: 14), itemBuilder: (BuildContext context, int index) { return DoctorCard( - onTap: () {}, + onTap: null, isInOutPatient: true, isShowInOutPatient: false, name: TranslationBase.of(context).dr.toString() + " " + model.vaccineList[index].doctorName, diff --git a/lib/widgets/data_display/medical/doctor_card.dart b/lib/widgets/data_display/medical/doctor_card.dart index 70f727ba..9dcaa5ff 100644 --- a/lib/widgets/data_display/medical/doctor_card.dart +++ b/lib/widgets/data_display/medical/doctor_card.dart @@ -216,10 +216,10 @@ class DoctorCard extends StatelessWidget { color: Theme.of(context).primaryColor, ), ) - : Icon( + : onTap != null ? Icon( Icons.arrow_forward, color: Theme.of(context).primaryColor, - ), + ) : SizedBox(), ), ), ],