Haroon6138
/
PatientApp-KKUMC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

widgets removed and calls are removed

Browse Source
king_kahild_app_updated_3.32
taha.alam 1 year ago
parent 6139a38f37
commit 0f592c8a92
22 changed files with 408 additions and 312 deletions
Show Stats Download Patch File Download Diff File

36
lib/config/localized_values.dart
Unescape Escape View File

@ -497,11 +497,11 @@ const Map localizedValues = {
"LoginRegister": {"en": "Login", "ar": "دخول"},
"OrderLog": {"en": "Order Log", "ar": " سجل الطلبات"},
"info-lab": {
"en": "This service allows you to view the results of all laboratory tests performed in Al Habib Medical Group as well as sending the report via e-mail.",
"en": "This service allows you to view the results of all laboratory tests performed in King Khalid University as well as sending the report via e-mail.",
"ar": "خدمة نتائج المختبر: هذه الخدمة تمكنك من الاطلاع على نتائج جميع الفحوصات المخبرية التي تمت في مجموعة الحبيب الطبية."
},
"info-radiology": {
"en": "This service allows you to view the reports and photos of radiology in Al Habib Medical Group as well as send the report by e-mail.",
"en": "This service allows you to view the reports and photos of radiology in King Khalid University as well as send the report by e-mail.",
"ar": "خدمة الاشعة: هذه الخدمة تمكنك من الاطلاع على تقارير وصور الاشعة التي تمت في مجموعة الحبيب الطبية وكذلك ارسال التقرير عن طريق الايميل."
},
"noReviewsAvailable": {"en": "No Reviews Available", "ar": "لا يوجد تقييمات"},
@ -708,11 +708,11 @@ const Map localizedValues = {
"ar": ["الاطلاع على معلومات الطبيب ومؤهلاته.", "الاطلاع على جدول الطبيب.", "الاطلاع على تفاصيل المواعيد التي تمت مع الطبيب.", "حجز موعد مع الطبيب."]
},
"info-my-doctor": {
"en": "This service allows you to see all the doctors you have visited in Al Habib Medical Group, and through this service:",
"en": "This service allows you to see all the doctors you have visited in King Khalid University, and through this service:",
"ar": "خدمة اطبائي: هذه الخدمة تمكنك من الاطلاع على جميع الاطباء الذين قمت بزيارتهم في مجموعة الحبيب الطبية, كما تستطيع من خلال هذه الخدمة:"
},
"info-prescriptions": {
"en": "This service allows you to view all the medical prescriptions issued by Al Habib Medical Group, and through this service, you can:",
"en": "This service allows you to view all the medical prescriptions issued by King Khalid University, and through this service, you can:",
"ar": "خدمة الوصفات الطبية: هذه الخدمة تمكنك من الاطلاع على جميع الوصفات الطبية التي تم اصدارها في مجموعة الحبيب الطبية، كما تستطيع من خلال هذه الخدمة:"
},
"info-my-prescription-points": {
@ -736,7 +736,7 @@ const Map localizedValues = {
]
},
"info-insurance-cards": {
"en": "This service allows you to view all the insurance cards that recorded during your visits to Al Habib Medical Group in addition to:",
"en": "This service allows you to view all the insurance cards that recorded during your visits to King Khalid University in addition to:",
"ar": "خدمة بطاقات التامين: هذه الخدمة تمكنك من الاطلاع على جميع بطاقات التامين والتي تم تسجيلها اثناء زياراتك لمجموعة الحبيب الطبية بالاضافة الى:"
},
"info-insurance-cards-points": {
@ -758,13 +758,13 @@ const Map localizedValues = {
]
},
"info-allergies": {
"en": "This service allows you to view all types of allergies recorded during your visits to Al Habib Medical Group.",
"ar": "خدمة الحساسية: هذه الخدمة تمكنك من الاطلاع على جميع انواع الحساسية التي تم تسجيلها خلال زياراتك في مجموعة الحبيب الطبية."
"en": "This service allows you to view all types of allergies recorded during your visits to King Khalid University.",
"ar": "خدمة الحساسية: هذه الخدمة تمكنك من الاطلاع على جميع انواع الحساسية التي تم تسجيلها خلال زياراتك في لجامعة الملك خالد."
},
"sick-leaves": {"en": "Sick Leaves", "ar": "الاجازات المرضية"},
"info-sick-leaves": {
"en": "This service allows you to view all sick leaves that were taken in Al Habib Medical Group in addition to:",
"ar": "الاجازات المرضية: هذه الخدمة تمكنك من الاطلاع على جميع الاجازات المرضية والتي تم اصدارها في مجموعة الحبيب الطبية بالاضافة الى:"
"en": "This service allows you to view all sick leaves that were taken in King Khalid University in addition to:",
"ar": "الاجازات المرضية: هذه الخدمة تمكنك من الاطلاع على جميع الاجازات المرضية والتي تم اصدارها في لجامعة الملك خالد بالاضافة الى:"
},
"info-sick-leave-points": {
"en": [
@ -923,13 +923,13 @@ const Map localizedValues = {
"خدمة المؤشرات الحيوية: هذه الخدمة تمكنك من الاطلاع على جميع المؤشرات الحيوية على سبيل المثال (الطول، الوزن، مؤشر كتلة الجسم، معدل نبضات القلب الخ.) التي تمت في مجموعة الحبيب الطبية وكذلك رسوم بيانية على مستوى المؤشر."
},
"info-advance-payment": {
"en": "This service designed so that you can deposit an amount in advance either in your account or in someone else's account with Al Habib Medical Group.",
"ar": "تم تصميم هذه الخدمة حتى تتمكن من دفع مبلغ مقدما او تحت الحساب سواء في حسابك او في حساب شخص اخر لدى مجموعة الحبيب الطبية."
"en": "This service designed so that you can deposit an amount in advance either in your account or in someone else's account with King Khalid University.",
"ar": "تم تصميم هذه الخدمة حتى تتمكن من دفع مبلغ مقدما او تحت الحساب سواء في حسابك او في حساب شخص اخر لدى لجامعة الملك خالد."
},
"info-my-balance": {"en": "This service allows you to check your balance in all branchs", "ar": "هذه الخدمه تتيح لك الاطلاع رصيدك في كل الفروع"},
"er-contant": {
"en": "This service displays nearest branch among all the branches of Al Habib Medical Group based on your current location.",
"ar": "تعرض هذه الخدمة أقرب فرع من بين جميع فروع مجموعة الحبيب الطبية بناءً على موقعك الحالي."
"en": "This service displays nearest branch among all the branches of King Khalid University based on your current location.",
"ar": "تعرض هذه الخدمة أقرب فرع من بين جميع فروع لجامعة الملك خالد بناءً على موقعك الحالي."
},
"er": {"en": "ER", "ar": "الطوارىء"},
"transportation-Service": {"en": "Ambulance Request", "ar": "خدمات النقل الاسعافي"},
@ -980,8 +980,8 @@ const Map localizedValues = {
"transport-method": {"en": "Transportation Method", "ar": "طريقة النقل"},
"directions": {"en": "Directions", "ar": "الاتجاهات"},
"info-my-appointments": {
"en": "This service allows you to see all the appointment you have visited in Al Habib Medical Group, and through this service:",
"ar": "خدمة مواعيدي: هذه الخدمة تمكنك من الاطلاع على جميع المواعيد التي قمت بزيارتهم في مجموعة الحبيب الطبية, كما تستطيع من خلال هذه الخدمة:"
"en": "This service allows you to see all the appointment you have visited in King Khalid University, and through this service:",
"ar": "خدمة مواعيدي: هذه الخدمة تمكنك من الاطلاع على جميع المواعيد التي قمت بزيارتهم في لجامعة الملك خالد, كما تستطيع من خلال هذه الخدمة:"
},
"info-todo": {
"en": "This service is designed to enable you to have a quick link to the list of tasks that need to be done",
@ -1091,8 +1091,8 @@ const Map localizedValues = {
"attach-insurace-image": {"en": "Attach insurance card image", "ar": "إرفاق صورة بطاقة التأمين"},
"upload-without-image": {"en": "You can still submit, if you don't have Insurance Image", "ar": "لا يزال بإمكانك الإرسال ، إذا لم يكن لديك صورة تأمين"},
"info-insur-cards": {
"en": "This service allows you to view all the insurance cards that recorded during your visits to Al Habib Medical Group in addition to:",
"ar": "خدمة بطاقات التامين: هذه الخدمة تمكنك من الاطلاع على جميع بطاقات التامين والتي تم تسجيلها اثناء زياراتك لمجموعة الحبيب الطبية بالاضافة الى:"
"en": "This service allows you to view all the insurance cards that recorded during your visits to King Khalid University in addition to:",
"ar": "خدمة بطاقات التامين: هذه الخدمة تمكنك من الاطلاع على جميع بطاقات التامين والتي تم تسجيلها اثناء زياراتك لجامعة الملك خالد بالاضافة الى:"
},
"scan-now": {"en": "If you have a card/Document Scan now", "ar": "إذا كانت لديك بطاقة / مستند ارفقها الان"},
"liveCare": {"en": "Live Care", "ar": "لايف كير"},
@ -1484,7 +1484,7 @@ const Map localizedValues = {
"ar": " خدمة قياسات النظر: هذه الخدمة تمكنك من الاطلاع على جميع قياسات النظر والعدسات والنظارات التي تمت في مجموعة الحبيب الطبية."
},
"info-vaccines": {
"en": "This service allows you to view all the vaccinations that were taken in Al Habib Medical Group.",
"en": "This service allows you to view all the vaccinations that were taken in King Khalid University.",
"ar": "خدمة تطعيماتي: هذه الخدمة تمكنك من الاطلاع على جميع التطعيمات التي تمت في مجموعة الحبيب الطبية."
},
"info-trackers": {

26
lib/pages/BookAppointment/DoctorProfile.dart
Unescape Escape View File

@ -1,3 +1,4 @@
import 'package:diplomaticquarterapp/config/config.dart';
import 'package:diplomaticquarterapp/config/shared_pref_kay.dart';
import 'package:diplomaticquarterapp/core/model/hospitals/hospitals_model.dart';
import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
@ -6,6 +7,7 @@ import 'package:diplomaticquarterapp/models/Appointments/DoctorProfile.dart';
import 'package:diplomaticquarterapp/models/Appointments/DoctorRateDetails.dart';
import 'package:diplomaticquarterapp/models/Appointments/SearchInfoModel.dart';
import 'package:diplomaticquarterapp/models/Authentication/authenticated_user.dart';
import 'package:diplomaticquarterapp/models/Authentication/select_device_imei_res.dart';
import 'package:diplomaticquarterapp/models/Clinics/ClinicListResponse.dart';
import 'package:diplomaticquarterapp/models/header_model.dart';
import 'package:diplomaticquarterapp/pages/BookAppointment/DentalComplaints.dart';
@ -13,6 +15,7 @@ import 'package:diplomaticquarterapp/pages/BookAppointment/doctor_post_pre_image
import 'package:diplomaticquarterapp/pages/MyAppointments/SchedulePage.dart';
import 'package:diplomaticquarterapp/routes.dart';
import 'package:diplomaticquarterapp/services/appointment_services/GetDoctorsList.dart';
import 'package:diplomaticquarterapp/services/authentication/auth_provider.dart';
import 'package:diplomaticquarterapp/services/robo_search/event_provider.dart';
import 'package:diplomaticquarterapp/theme/colors.dart';
import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart';
@ -54,6 +57,7 @@ class _DoctorProfileState extends State<DoctorProfile> with TickerProviderStateM
bool showFooterButton = false;
var event = RobotProvider();
dynamic doctorSchedule;
final authService = new AuthProvider();
AppSharedPreferences sharedPref = AppSharedPreferences();
List<DoctorRateDetails> doctorDetailsList = [];
@ -95,7 +99,7 @@ class _DoctorProfileState extends State<DoctorProfile> with TickerProviderStateM
minWidth: MediaQuery.of(context).size.width * 0.7,
height: 40.0,
child: CustomTextButton(
backgroundColor: CustomColors.accentColor,
backgroundColor: CustomColors.primaryColor,
elevation: 0,
onPressed: goToBookConfirm,
child: Text(TranslationBase.of(context).reviewAppointment, style: TextStyle(fontSize: 16.0, letterSpacing: -0.48, color: Colors.white, fontWeight: FontWeight.w600)),
@ -153,7 +157,7 @@ class _DoctorProfileState extends State<DoctorProfile> with TickerProviderStateM
buttonTitle: TranslationBase.of(context).schedule,
),
mDivider(Colors.grey[300]!),
if (widget.docProfileList.isDoctorHasPrePostImages == true) Container(height: 50, alignment: Alignment.center, child: prePostImagesButton(context)),
// if (widget.docProfileList.isDoctorHasPrePostImages == true) Container(height: 50, alignment: Alignment.center, child: prePostImagesButton(context)),
TabBar(
onTap: (index) {
setState(() {
@ -576,7 +580,23 @@ class _DoctorProfileState extends State<DoctorProfile> with TickerProviderStateM
if (data != null) {
Navigator.of(context).pushNamed(CONFIRM_LOGIN);
} else {
Navigator.of(context).pushNamed(LOGIN_TYPE);
GifLoaderDialogUtils.showMyDialog(context);
authService.selectDeviceImei(DEVICE_TOKEN).then((SelectDeviceIMEIRES? value) {
GifLoaderDialogUtils.hideDialog(context);
if (value != null) {
sharedPref.setObject(IMEI_USER_DATA, value);
Navigator.of(context).pushNamed(CONFIRM_LOGIN);
} else {
Navigator.of(context).pushNamed(
LOGIN_TYPE,
);
}
}).catchError((err) {
GifLoaderDialogUtils.hideDialog(context);
Navigator.of(context).pushNamed(
LOGIN_TYPE,
);
});
}
}

3
lib/pages/BookAppointment/SearchResults.dart
Unescape Escape View File

@ -47,9 +47,6 @@ class SearchResults extends StatelessWidget {
},
itemBuilder: (context, index) {
return AppExpandableNotifier(
title: (patientDoctorAppointmentListHospital[index].distanceInKMs != "0")
? patientDoctorAppointmentListHospital[index].filterName! + " - " + patientDoctorAppointmentListHospital[index].distanceInKMs! + " " + TranslationBase.of(context).km
: patientDoctorAppointmentListHospital[index].filterName,
isTitleSingleLine: false,
isExpand: patientDoctorAppointmentListHospital.length == 1 ? true : false,
bodyWidget: ListView.separated(

45
lib/pages/BookAppointment/components/SearchByClinic.dart
Unescape Escape View File

@ -192,27 +192,28 @@ class _SearchByClinicState extends State<SearchByClinic> {
),
],
),
Padding(
padding: const EdgeInsets.only(left: 6, right: 6, top: 16),
child: Row(
children: <Widget>[
Checkbox(
activeColor: CustomColors.accentColor,
value: nearestAppo,
onChanged: (bool? value) {
setState(() {
nearestAppo = value!;
if (nearestAppo)
getProjectsList();
else
isProjectLoaded = false;
});
},
),
Text(TranslationBase.of(context).nearestAppo, style: TextStyle(fontSize: 14.0, letterSpacing: -0.56)),
],
),
),
mHeight(16),
// Padding(
// padding: const EdgeInsets.only(left: 6, right: 6, top: 16),
// child: Row(
// children: <Widget>[
// Checkbox(
// activeColor: CustomColors.accentColor,
// value: nearestAppo,
// onChanged: (bool? value) {
// setState(() {
// nearestAppo = value!;
// if (nearestAppo)
// getProjectsList();
// else
// isProjectLoaded = false;
// });
// },
// ),
// Text(TranslationBase.of(context).nearestAppo, style: TextStyle(fontSize: 14.0, letterSpacing: -0.56)),
// ],
// ),
// ),
widget.clnicIds != null && widget.clnicIds!.length > 1 && isLoaded == true
? Column(
crossAxisAlignment: CrossAxisAlignment.start,
@ -547,7 +548,7 @@ class _SearchByClinicState extends State<SearchByClinic> {
} else {
isProjectLoaded = false;
}
locationUtils.getCurrentLocation();
// locationUtils.getCurrentLocation();
})
.catchError((err) {})
.catchError((err) {

4
lib/pages/MyAppointments/AppointmentDetails.dart
Unescape Escape View File

@ -229,7 +229,7 @@ class _AppointmentDetailsState extends State<AppointmentDetails> with SingleTick
cancelFunction: () => {});
dialog.showAlertDialog(context);
},
color: CustomColors.accentColor,
color: CustomColors.primaryColor,
textColor: CustomColors.white,
),
),
@ -261,7 +261,7 @@ class _AppointmentDetailsState extends State<AppointmentDetails> with SingleTick
cancelFunction: () => {});
dialog.showAlertDialog(context);
},
color: CustomColors.accentColor,
color: CustomColors.primaryColor,
// textColor: Color(0xff000000),
),
),

20
lib/pages/MyAppointments/MyAppointments.dart
Unescape Escape View File

@ -106,16 +106,16 @@ class _MyAppointmentsState extends State<MyAppointments> with SingleTickerProvid
description: TranslationBase.of(context).infoMyAppointments,
body: Container(
child: Column(children: [
Row(
children: [
MyTabView(TranslationBase.of(context).byClinic, FilterType.Clinic, filterType!, () {
setFilterType(FilterType.Clinic);
}),
MyTabView(TranslationBase.of(context).byHospital, FilterType.Hospital, filterType!, () {
setFilterType(FilterType.Hospital);
}),
],
),
// Row(
// children: [
// MyTabView(TranslationBase.of(context).byClinic, FilterType.Clinic, filterType!, () {
// setFilterType(FilterType.Clinic);
// }),
// MyTabView(TranslationBase.of(context).byHospital, FilterType.Hospital, filterType!, () {
// setFilterType(FilterType.Hospital);
// }),
// ],
// ),
SizedBox(height: 20),
Padding(
padding: EdgeInsets.only(left: 21, right: 21),

6
lib/pages/MyAppointments/models/ArrivedButtons.dart
Unescape Escape View File

@ -21,11 +21,5 @@ class ArrivedButtons {
"icon": 'lab_result.svg',
"caller": "labResult",
},
{
"title": TranslationBase.of(AppGlobal.context).askDoctor,
"subtitle": TranslationBase.of(AppGlobal.context).service,
"icon": 'ask_doctor.svg',
"caller": "askDoc",
},
];
}

14
lib/pages/MyAppointments/models/BookedButtons.dart
Unescape Escape View File

@ -21,12 +21,12 @@ class BookedButtons {
// "icon": "assets/images/new-design/cancel_icon.png",
// "caller": "onCancelAppointment",
// },
{
"title": TranslationBase.of(AppGlobal.context).raise,
"subtitle": TranslationBase.of(AppGlobal.context).complaint,
"icon": "raise_comp.svg",
"caller": "insertComplaint",
},
// {
// "title": TranslationBase.of(AppGlobal.context).raise,
// "subtitle": TranslationBase.of(AppGlobal.context).complaint,
// "icon": "raise_comp.svg",
// "caller": "insertComplaint",
// },
{
"title": TranslationBase.of(AppGlobal.context).add,
"subtitle": TranslationBase.of(AppGlobal.context).reminder,
@ -39,6 +39,6 @@ class BookedButtons {
"icon": "hosp_location.svg",
"caller": "navigateToProject",
},
{"title": TranslationBase.of(AppGlobal.context).online, "subtitle": TranslationBase.of(AppGlobal.context).payment, "icon": "online_payment.svg", "caller": "goToTodoList"}
// {"title": TranslationBase.of(AppGlobal.context).online, "subtitle": TranslationBase.of(AppGlobal.context).payment, "icon": "online_payment.svg", "caller": "goToTodoList"}
];
}

74
lib/pages/landing/landing_page.dart
Unescape Escape View File

@ -397,7 +397,23 @@ class _LandingPageState extends State<LandingPage> with WidgetsBindingObserver {
if (data != null) {
Navigator.of(context).pushNamed(CONFIRM_LOGIN);
} else {
Navigator.of(context).pushNamed(LOGIN_TYPE);
GifLoaderDialogUtils.showMyDialog(context);
authService.selectDeviceImei(DEVICE_TOKEN).then((SelectDeviceIMEIRES? value) {
GifLoaderDialogUtils.hideDialog(context);
if (value != null) {
sharedPref.setObject(IMEI_USER_DATA, value);
Navigator.of(context).pushNamed(CONFIRM_LOGIN);
} else {
Navigator.of(context).pushNamed(
LOGIN_TYPE,
);
}
}).catchError((err) {
GifLoaderDialogUtils.hideDialog(context);
Navigator.of(context).pushNamed(
LOGIN_TYPE,
);
});
}
// AppGlobal.context = context;
// GifLoaderDialogUtils.showMyDialog(context);
@ -552,34 +568,34 @@ class _LandingPageState extends State<LandingPage> with WidgetsBindingObserver {
pageController.jumpToPage(0);
},
),
projectViewModel.isLogin &&
model.notificationsCount != null &&
!projectViewModel.isLoginChild
? Positioned(
right: projectViewModel.isArabic ? 35 : 0,
top: 5,
child: new Container(
padding: EdgeInsets.all(4),
decoration: new BoxDecoration(
color: CustomColors.primaryColor,
borderRadius: BorderRadius.circular(20),
),
constraints: BoxConstraints(
minWidth: 20,
minHeight: 20,
),
child: Text(
model.notificationsCount.toString(),
style: TextStyle(
color: Colors.white,
fontSize:
projectViewModel.isArabic ? 8 : 9,
),
textAlign: TextAlign.center,
),
),
)
: SizedBox()
// projectViewModel.isLogin &&
// model.notificationsCount != null &&
// !projectViewModel.isLoginChild
// ? Positioned(
// right: projectViewModel.isArabic ? 35 : 0,
// top: 5,
// child: new Container(
// padding: EdgeInsets.all(4),
// decoration: new BoxDecoration(
// color: CustomColors.primaryColor,
// borderRadius: BorderRadius.circular(20),
// ),
// constraints: BoxConstraints(
// minWidth: 20,
// minHeight: 20,
// ),
// child: Text(
// model.notificationsCount.toString(),
// style: TextStyle(
// color: Colors.white,
// fontSize:
// projectViewModel.isArabic ? 8 : 9,
// ),
// textAlign: TextAlign.center,
// ),
// ),
// )
// : SizedBox()
],
);
},

62
lib/pages/login/confirm-login.dart
Unescape Escape View File

@ -910,34 +910,40 @@ class _ConfirmLogin extends State<ConfirmLogin> {
// GifLoaderDialogUtils.hideDialog(context);
getToDoCount();
appointmentRateViewModel
.getIsLastAppointmentRatedList(projectViewModel.isArabic ? 1 : 2)
.then((value) =>
{
GifLoaderDialogUtils.hideDialog(AppGlobal.context),
if (appointmentRateViewModel.isHaveAppointmentNotRate)
{
Navigator.pushAndRemoveUntil(
context,
FadePage(
page: RateAppointmentDoctor(),
),
(r) => false)
}
else
{
Navigator.pushAndRemoveUntil(
context,
FadePage(
page: LandingPage(),
),
(r) => false)
},
insertIMEI()
})
.catchError((err) {
print(err);
});
Navigator.pushAndRemoveUntil(
context,
FadePage(
page: LandingPage(),
),
(r) => false);
// appointmentRateViewModel
// .getIsLastAppointmentRatedList(projectViewModel.isArabic ? 1 : 2)
// .then((value) =>
// {
// GifLoaderDialogUtils.hideDialog(AppGlobal.context),
// if (appointmentRateViewModel.isHaveAppointmentNotRate)
// {
// Navigator.pushAndRemoveUntil(
// context,
// FadePage(
// page: RateAppointmentDoctor(),
// ),
// (r) => false)
// }
// else
// {
// Navigator.pushAndRemoveUntil(
// context,
// FadePage(
// page: LandingPage(),
// ),
// (r) => false)
// },
// insertIMEI()
// })
// .catchError((err) {
// print(err);
// });
// getToDoCount();

61
lib/pages/login/login.dart
Unescape Escape View File

@ -313,6 +313,7 @@ class _Login extends State<Login> {
confirmMessage: err,
okText: TranslationBase.of(context).confirm,
cancelText: TranslationBase.of(context).cancel_nocaps,
okButtonVisibility: false,
okFunction: () => {
ConfirmDialog.closeAlertDialog(context),
Navigator.of(context).push(FadePage(page: RegisterNew())),
@ -386,33 +387,39 @@ class _Login extends State<Login> {
// ),
// (r) => false);
getToDoCount();
appointmentRateViewModel
.getIsLastAppointmentRatedList(projectViewModel.isArabic ? 1 : 2)
.then((value) => {
GifLoaderDialogUtils.hideDialog(context),
if (appointmentRateViewModel.isHaveAppointmentNotRate)
{
Navigator.pushAndRemoveUntil(
context,
FadePage(
page: RateAppointmentDoctor(),
),
(r) => false)
}
else
{
Navigator.pushAndRemoveUntil(
context,
FadePage(
page: LandingPage(),
),
(r) => false)
}
})
.catchError((err) {
print(err);
GifLoaderDialogUtils.hideDialog(context);
});
Navigator.pushAndRemoveUntil(
context,
FadePage(
page: LandingPage(),
),
(r) => false);
// appointmentRateViewModel
// .getIsLastAppointmentRatedList(projectViewModel.isArabic ? 1 : 2)
// .then((value) => {
// GifLoaderDialogUtils.hideDialog(context),
// if (appointmentRateViewModel.isHaveAppointmentNotRate)
// {
// Navigator.pushAndRemoveUntil(
// context,
// FadePage(
// page: RateAppointmentDoctor(),
// ),
// (r) => false)
// }
// else
// {
// Navigator.pushAndRemoveUntil(
// context,
// FadePage(
// page: LandingPage(),
// ),
// (r) => false)
// }
// })
// .catchError((err) {
// print(err);
// GifLoaderDialogUtils.hideDialog(context);
// });
});
}

20
lib/pages/medical/doctor/doctor_home_page.dart
Unescape Escape View File

@ -33,16 +33,16 @@ class DoctorHomePage extends StatelessWidget {
backgroundColor: Color(0xffF8F8F8),
body: Column(
children: <Widget>[
Row(
children: <Widget>[
MyTabView(TranslationBase.of(context).byClinic, FilterType.Clinic, model.filterType, () {
model.setFilterType(FilterType.Clinic);
}),
MyTabView(TranslationBase.of(context).byHospital, FilterType.Hospital, model.filterType, () {
model.setFilterType(FilterType.Hospital);
}),
],
),
// Row(
// children: <Widget>[
// MyTabView(TranslationBase.of(context).byClinic, FilterType.Clinic, model.filterType, () {
// model.setFilterType(FilterType.Clinic);
// }),
// MyTabView(TranslationBase.of(context).byHospital, FilterType.Hospital, model.filterType, () {
// model.setFilterType(FilterType.Hospital);
// }),
// ],
// ),
Expanded(
child: FractionallySizedBox(
widthFactor: 1.0,

20
lib/pages/medical/labs/labs_home_page.dart
Unescape Escape View File

@ -36,16 +36,16 @@ class LabsHomePage extends StatelessWidget {
imagesInfo: imagesInfo,
body: Column(
children: [
Row(
children: <Widget>[
MyTabView(TranslationBase.of(context).byClinic, FilterType.Clinic, model.filterType, () {
model.setFilterType(FilterType.Clinic);
}),
MyTabView(TranslationBase.of(context).byHospital, FilterType.Hospital, model.filterType, () {
model.setFilterType(FilterType.Hospital);
}),
],
),
// Row(
// children: <Widget>[
// MyTabView(TranslationBase.of(context).byClinic, FilterType.Clinic, model.filterType, () {
// model.setFilterType(FilterType.Clinic);
// }),
// MyTabView(TranslationBase.of(context).byHospital, FilterType.Hospital, model.filterType, () {
// model.setFilterType(FilterType.Hospital);
// }),
// ],
// ),
Expanded(
child: FractionallySizedBox(
widthFactor: 1.0,

119
lib/pages/medical/prescriptions/prescriptions_home_page.dart
Unescape Escape View File

@ -56,63 +56,74 @@ class _HomePrescriptionsPageState extends State<HomePrescriptionsPage> with Sing
showNewAppBarTitle: true,
body: Column(
children: <Widget>[
TabBar(
// isScrollable: true,
controller: _tabController,
indicatorWeight: 3.0,
indicatorSize: TabBarIndicatorSize.tab,
labelColor: Color(0xff2B353E),
unselectedLabelColor: Color(0xff575757),
labelPadding: EdgeInsets.only(top: 15, bottom: 13, left: 20, right: 20),
labelStyle: TextStyle(
fontSize: 15,
fontWeight: FontWeight.w600,
letterSpacing: -0.48,
),
unselectedLabelStyle: TextStyle(
fontSize: 15,
fontWeight: FontWeight.w600,
letterSpacing: -0.48,
),
tabs: [
Text(TranslationBase.of(context).byClinic, style: TextStyle(fontFamily: projectViewModel.isArabic ? 'Cairo' : 'Poppins')),
Text(TranslationBase.of(context).byHospital, style: TextStyle(fontFamily: projectViewModel.isArabic ? 'Cairo' : 'Poppins')),
Text(TranslationBase.of(context).orderLog, style: TextStyle(fontFamily: projectViewModel.isArabic ? 'Cairo' : 'Poppins')),
],
),
Expanded(
child: TabBarView(
physics: BouncingScrollPhysics(),
controller: _tabController,
children: <Widget>[
PrescriptionsPage(
FilterType.Clinic,
prescriptionsViewModel: model,
showOrderLog: () async {
_tabController.animateTo(2);
// await model.getPrescriptionsOrders(showLoading: true);
setState(() {});
},
),
PrescriptionsPage(
FilterType.Hospital,
prescriptionsViewModel: model,
showOrderLog: () async {
_tabController.animateTo(2);
// await model.getPrescriptionsOrders(showLoading: true);
setState(() {});
},
),
PrescriptionsHistoryPage(
prescriptionsViewModel: model,
showOrderLog: () async {
await model.getPrescriptionsOrders(showLoading: true);
setState(() {});
},
)
],
child: PrescriptionsPage(
FilterType.Clinic,
prescriptionsViewModel: model,
showOrderLog: () async {
_tabController.animateTo(2);
// await model.getPrescriptionsOrders(showLoading: true);
setState(() {});
},
),
)
// TabBar(
// // isScrollable: true,
// controller: _tabController,
// indicatorWeight: 3.0,
// indicatorSize: TabBarIndicatorSize.tab,
// labelColor: Color(0xff2B353E),
// unselectedLabelColor: Color(0xff575757),
// labelPadding: EdgeInsets.only(top: 15, bottom: 13, left: 20, right: 20),
// labelStyle: TextStyle(
// fontSize: 15,
// fontWeight: FontWeight.w600,
// letterSpacing: -0.48,
// ),
// unselectedLabelStyle: TextStyle(
// fontSize: 15,
// fontWeight: FontWeight.w600,
// letterSpacing: -0.48,
// ),
// tabs: [
// Text(TranslationBase.of(context).byClinic, style: TextStyle(fontFamily: projectViewModel.isArabic ? 'Cairo' : 'Poppins')),
// Text(TranslationBase.of(context).byHospital, style: TextStyle(fontFamily: projectViewModel.isArabic ? 'Cairo' : 'Poppins')),
// Text(TranslationBase.of(context).orderLog, style: TextStyle(fontFamily: projectViewModel.isArabic ? 'Cairo' : 'Poppins')),
// ],
// ),
// Expanded(
// child: TabBarView(
// physics: BouncingScrollPhysics(),
// controller: _tabController,
// children: <Widget>[
// PrescriptionsPage(
// FilterType.Clinic,
// prescriptionsViewModel: model,
// showOrderLog: () async {
// _tabController.animateTo(2);
// // await model.getPrescriptionsOrders(showLoading: true);
// setState(() {});
// },
// ),
// PrescriptionsPage(
// FilterType.Hospital,
// prescriptionsViewModel: model,
// showOrderLog: () async {
// _tabController.animateTo(2);
// // await model.getPrescriptionsOrders(showLoading: true);
// setState(() {});
// },
// ),
// PrescriptionsHistoryPage(
// prescriptionsViewModel: model,
// showOrderLog: () async {
// await model.getPrescriptionsOrders(showLoading: true);
// setState(() {});
// },
// )
// ],
// ),
// )
],
),
),

20
lib/pages/medical/radiology/radiology_home_page.dart
Unescape Escape View File

@ -39,16 +39,16 @@ class RadiologyHomePage extends StatelessWidget {
imagesInfo: imagesInfo,
body: Column(
children: <Widget>[
Row(
children: <Widget>[
MyTabView(TranslationBase.of(context).byClinic, FilterType.Clinic, model.filterType, () {
model.setFilterType(FilterType.Clinic);
}),
MyTabView(TranslationBase.of(context).byHospital, FilterType.Hospital, model.filterType, () {
model.setFilterType(FilterType.Hospital);
}),
],
),
// Row(
// children: <Widget>[
// MyTabView(TranslationBase.of(context).byClinic, FilterType.Clinic, model.filterType, () {
// model.setFilterType(FilterType.Clinic);
// }),
// MyTabView(TranslationBase.of(context).byHospital, FilterType.Hospital, model.filterType, () {
// model.setFilterType(FilterType.Hospital);
// }),
// ],
// ),
Expanded(
child: FractionallySizedBox(

102
lib/uitl/utils.dart
Unescape Escape View File

@ -266,57 +266,57 @@ class Utils {
hasBadge: true,
isEnable: projectViewModel!.havePrivilege(5)),
),
projectViewModel.isArabic
? !projectViewModel.user.isFamily
? Positioned(
left: 8,
top: 4,
child: badge_import.Badge(
badgeAnimation: badge_import.BadgeAnimation.fade(
toAnimate: false),
badgeStyle: badge_import.BadgeStyle(
elevation: 0,
shape: badge_import.BadgeShape.circle,
badgeColor: secondaryColor!.withOpacity(1.0),
borderRadius: BorderRadius.circular(8),
),
position: badge_import.BadgePosition.topEnd(),
badgeContent: Container(
padding: EdgeInsets.all(2.0),
child: Text(count.toString(),
style: TextStyle(
color: Colors.white,
fontWeight: FontWeight.bold,
fontSize: 12.0)),
),
),
)
: Container()
: !projectViewModel.user!.isFamily
? Positioned(
right: 8,
top: 4,
child: badge_import.Badge(
position: badge_import.BadgePosition.topEnd(),
badgeAnimation: badge_import.BadgeAnimation.fade(
toAnimate: false),
badgeStyle: badge_import.BadgeStyle(
elevation: 0,
shape: badge_import.BadgeShape.circle,
badgeColor: secondaryColor!.withOpacity(1.0),
borderRadius: BorderRadius.circular(8),
),
badgeContent: Container(
padding: EdgeInsets.all(2.0),
child: Text(count.toString(),
style: TextStyle(
color: Colors.white,
fontWeight: FontWeight.bold,
fontSize: 12.0)),
),
),
)
: Container(),
// projectViewModel.isArabic
// ? !projectViewModel.user.isFamily
// ? Positioned(
// left: 8,
// top: 4,
// child: badge_import.Badge(
// badgeAnimation: badge_import.BadgeAnimation.fade(
// toAnimate: false),
// badgeStyle: badge_import.BadgeStyle(
// elevation: 0,
// shape: badge_import.BadgeShape.circle,
// badgeColor: secondaryColor!.withOpacity(1.0),
// borderRadius: BorderRadius.circular(8),
// ),
// position: badge_import.BadgePosition.topEnd(),
// badgeContent: Container(
// padding: EdgeInsets.all(2.0),
// child: Text(count.toString(),
// style: TextStyle(
// color: Colors.white,
// fontWeight: FontWeight.bold,
// fontSize: 12.0)),
// ),
// ),
// )
// : Container()
// : !projectViewModel.user!.isFamily
// ? Positioned(
// right: 8,
// top: 4,
// child: badge_import.Badge(
// position: badge_import.BadgePosition.topEnd(),
// badgeAnimation: badge_import.BadgeAnimation.fade(
// toAnimate: false),
// badgeStyle: badge_import.BadgeStyle(
// elevation: 0,
// shape: badge_import.BadgeShape.circle,
// badgeColor: secondaryColor!.withOpacity(1.0),
// borderRadius: BorderRadius.circular(8),
// ),
// badgeContent: Container(
// padding: EdgeInsets.all(2.0),
// child: Text(count.toString(),
// style: TextStyle(
// color: Colors.white,
// fontWeight: FontWeight.bold,
// fontSize: 12.0)),
// ),
// ),
// )
// : Container(),
])
: MedicalProfileItem(
title: TranslationBase.of(context!).myAppointments,

4
lib/widgets/buttons/floatingActionButton.dart
Unescape Escape View File

@ -76,8 +76,8 @@ class _FloatingButtonState extends State<FloatingButton>
margin: EdgeInsets.only(bottom: 4),
child: Container(
width: 100,
height: 100,
width: 102,
height: 102,
decoration: BoxDecoration(
// borderRadius: BorderRadius.all(Radius.circular(70.0)),
color: appColor,

2
lib/widgets/data_display/medical/doctor_card.dart
Unescape Escape View File

@ -233,7 +233,7 @@ class DoctorCard extends StatelessWidget {
return time != null
? Text(
"${time.days ?? 0}:${time.hours ?? 0}:${time.min}:${time.sec}",
style: TextStyle(fontSize: 14, fontWeight: FontWeight.w600, color: Color(0xffD02127), letterSpacing: -0.48, height: 18 / 12),
style: TextStyle(fontSize: 14, fontWeight: FontWeight.w600, color: CustomColors.primaryColor, letterSpacing: -0.48, height: 18 / 12),
)
: Container();
},

4
lib/widgets/data_display/medical/time_line_new_widget.dart
Unescape Escape View File

@ -353,13 +353,13 @@ class _TimeLineViewState extends State<TimeLineView> {
Navigator.of(context).pushNamed(CONFIRM_LOGIN);
} else {
Navigator.of(context).pushNamed(
WELCOME_LOGIN,
LOGIN_TYPE,
);
}
}).catchError((err) {
GifLoaderDialogUtils.hideDialog(context);
Navigator.of(context).pushNamed(
WELCOME_LOGIN,
LOGIN_TYPE,
);
});
}

33
lib/widgets/dialogs/confirm_dialog.dart
Unescape Escape View File

@ -15,8 +15,9 @@ class ConfirmDialog {
final VoidCallback okFunction;
final Function? cancelFunction;
final isDissmissable;
final bool okButtonVisibility;
ConfirmDialog({required this.context, this.title, required this.confirmMessage, required this.okText, required this.cancelText, required this.okFunction, required this.cancelFunction, this.isDissmissable = true});
ConfirmDialog({required this.context, this.title, required this.confirmMessage, required this.okText, required this.cancelText, required this.okFunction, required this.cancelFunction, this.isDissmissable = true, this.okButtonVisibility = true});
showAlertDialog(BuildContext context) {
Dialog alert = Dialog(
@ -30,6 +31,7 @@ class ConfirmDialog {
cancelText,
cancelFunction: cancelFunction,
okFunction: okFunction,
okButtonVisibility: okButtonVisibility,
),
),
);
@ -57,8 +59,8 @@ class Mdialog extends StatelessWidget {
final okText;
final cancelText;
BuildContext? _context;
Mdialog(this._context, this.title, this.description, this.okText, this.cancelText, {this.okFunction, this.cancelFunction});
final bool okButtonVisibility;
Mdialog(this._context, this.title, this.description, this.okText, this.cancelText, {this.okFunction, this.cancelFunction, required this.okButtonVisibility});
@override
Widget build(BuildContext context) {
@ -106,17 +108,20 @@ class Mdialog extends StatelessWidget {
),
),
mWidth(8),
Expanded(
child: InkWell(
onTap: okFunction,
child: Container(
decoration: containerRadius(CustomColors.green, 12),
padding: EdgeInsets.only(top: 8,bottom: 8),
child: Center(
child: Texts(
okText,
color: Colors.white,
variant: "caption3",
Visibility(
visible: okButtonVisibility,
child: Expanded(
child: InkWell(
onTap: okFunction,
child: Container(
decoration: containerRadius(CustomColors.green, 12),
padding: EdgeInsets.only(top: 8,bottom: 8),
child: Center(
child: Texts(
okText,
color: Colors.white,
variant: "caption3",
),
),
),
),

42
lib/widgets/others/not_auh_page.dart
Unescape Escape View File

@ -335,8 +335,46 @@ class _NotAutPageState extends State<NotAutPage> {
if (data != null) {
Navigator.of(context).pushNamed(CONFIRM_LOGIN);
} else {
Navigator.of(context).pushNamed(LOGIN_TYPE);
GifLoaderDialogUtils.showMyDialog(context);
authService.selectDeviceImei(DEVICE_TOKEN).then((SelectDeviceIMEIRES? value) {
GifLoaderDialogUtils.hideDialog(context);
if (value != null) {
sharedPref.setObject(IMEI_USER_DATA, value);
Navigator.of(context).pushNamed(CONFIRM_LOGIN);
} else {
Navigator.of(context).pushNamed(
LOGIN_TYPE,
);
}
}).catchError((err) {
GifLoaderDialogUtils.hideDialog(context);
Navigator.of(context).pushNamed(
LOGIN_TYPE,
);
});}
/* var data = await sharedPref.getObject(IMEI_USER_DATA);
sharedPref.remove(REGISTER_DATA_FOR_LOGIIN);
if (data != null) {
Navigator.of(context).pushNamed(CONFIRM_LOGIN);
} else {
GifLoaderDialogUtils.showMyDialog(context);
authService.selectDeviceImei(DEVICE_TOKEN).then((SelectDeviceIMEIRES? value) {
GifLoaderDialogUtils.hideDialog(context);
if (value != null) {
sharedPref.setObject(IMEI_USER_DATA, value);
Navigator.of(context).pushNamed(CONFIRM_LOGIN);
} else {
Navigator.of(context).pushNamed(
LOGIN_TYPE,
);
}
}).catchError((err) {
GifLoaderDialogUtils.hideDialog(context);
Navigator.of(context).pushNamed(
LOGIN_TYPE,
);
});*/
}
}
}

3
lib/widgets/otp/sms-popup.dart
Unescape Escape View File

@ -3,6 +3,7 @@ import 'dart:io';
import 'package:diplomaticquarterapp/config/size_config.dart';
import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
import 'package:diplomaticquarterapp/theme/colors.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart';
@ -172,7 +173,7 @@ class SMSOTP {
children: <TextSpan>[
TextSpan(
text: displayTime,
style: TextStyle(fontSize: 16, fontWeight: FontWeight.w600, color: Color(0xffD02127), letterSpacing: -0.48),
style: TextStyle(fontSize: 16, fontWeight: FontWeight.w600, color: CustomColors.primaryColor, letterSpacing: -0.48),
),
],
),

Write Preview
Loading…
Cancel
Save