taha.alam
|
fa87e74b02
|
WD: Border Added for the directional for multilingual
|
12 months ago |
taha.alam
|
4c4ae6caef
|
WD: Translation of words added and download button added
|
12 months ago |
taha.alam
|
3d27fbdea8
|
WD: lab report changes
|
12 months ago |
taha.alam
|
8509c3d94d
|
WD: picking otp and providing the code to flutter channel
|
1 year ago |
haroon amjad
|
b677be9e3c
|
Updates & fixes
|
1 year ago |
taha.alam
|
615f3bfa8e
|
WD: region filter is added.
|
1 year ago |
taha.alam
|
cd460ee31b
|
WIP: doctor list by region
|
1 year ago |
haroon amjad
|
229efb2e25
|
Medical report In-App view & share enabled & update sent to stores VersionID 17.2
|
1 year ago |
haroon amjad
|
c72892b1a6
|
SMS Auto OTP Verify enabled & build sent to stores, VersionID 17.1
|
1 year ago |
haroon amjad
|
b5eaedb721
|
Update to stores VersionID 17.1, CR 5047 & CR 7241.
|
1 year ago |
haroon amjad
|
3f22d69058
|
Merge branch 'dev_v3.13.6' into dev_3.13.6_CR5047_LiveCare_Enhancements
# Conflicts:
# lib/config/config.dart
# lib/main.dart
# lib/splashPage.dart
# lib/uitl/CalendarUtils.dart
# lib/uitl/translations_delegate_base.dart
|
1 year ago |
haroon amjad
|
0e73d6d23e
|
updates
|
1 year ago |
haroon amjad
|
e0de0768b6
|
CR 7241 changes, ProjectID added in radiology results if navigating from appointment details
|
1 year ago |
haroon amjad
|
ab33d06b91
|
Fix for VIDA4 Lab Special Result
|
1 year ago |
haroon amjad
|
d474eb9a24
|
Code commented for Lab result widget, ER Online CheckIn QR & location check-in & Patient occupation selection to publish laser clinic changes to store - VersionID 17.0
|
1 year ago |
haroon amjad
|
9909cfaa57
|
QRCode & Location checkin implemented in ER Online Check-In
|
1 year ago |
haroon amjad
|
545cfcd6d9
|
updates
|
1 year ago |
haroon amjad
|
924c111771
|
Lab result widget fixes
|
1 year ago |
haroon amjad
|
cfcba179c4
|
CR 7241 Lab result enhancement code merged
|
1 year ago |
haroon amjad
|
b80e171d25
|
Merge branch 'dev_3.3_LabReportEnhancementCR' into dev_3.13.6_Development
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/core/model/labs/patient_lab_orders.dart
# lib/uitl/translations_delegate_base.dart
# lib/uitl/utils.dart
# lib/widgets/charts/show_chart.dart
# lib/widgets/data_display/medical/LabResult/LabResultWidget.dart
# lib/widgets/data_display/medical/LabResult/laboratory_result_widget.dart
# lib/widgets/my_rich_text.dart
|
1 year ago |
haroon amjad
|
1561a776e3
|
Merge branch 'dev_v3.13.6' into dev_3.13.6_Development
# Conflicts:
# lib/config/config.dart
# lib/pages/ErService/EROnlineCheckIn/EROnlineCheckInBookAppointment.dart
# lib/pages/ErService/EROnlineCheckIn/EROnlineCheckInHome.dart
# lib/pages/ErService/EROnlineCheckIn/EROnlineCheckInPaymentDetails.dart
# lib/pages/landing/fragments/home_page_fragment2.dart
# lib/services/appointment_services/GetDoctorsList.dart
# lib/services/clinic_services/get_clinic_service.dart
|
1 year ago |
haroon amjad
|
20bfdc3652
|
Project Name Top & Bottom changes implemented
|
1 year ago |
Aamir
|
3d2e0a5442
|
cr 7211 lab report new ui changes
|
1 year ago |
Aamir
|
b74a433798
|
cr 7211 lab report new ui changes
|
1 year ago |
haroon amjad
|
f58e07d789
|
Merge branch 'dev_v3.13.6' into dev_3.13.6_CR5047_LiveCare_Enhancements
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/core/service/client/base_app_client.dart
# lib/pages/conference/zoom/call_screen.dart
# lib/uitl/translations_delegate_base.dart
|
1 year ago |
haroon amjad
|
6a555ace41
|
ER Online CheckIn & InPatient CR implemented
|
1 year ago |
haroon amjad
|
073cb9f7e8
|
Update to stores 16.5:
1. Indoor navigation
2. Walkin Appointment
3. Derma Package
4. NPHIES Eligibility
|
1 year ago |
Haroon Amjad
|
69493934b1
|
Merge branch 'dev_v3.13.6' into dev_v_3.13.6_CR_6804
# Conflicts:
# lib/config/localized_values.dart
# lib/pages/BookAppointment/BookConfirm.dart
# lib/pages/BookAppointment/QRCode.dart
|
1 year ago |
Haroon Amjad
|
057994dfd2
|
Merge branch 'dev_3.13.6_CR6750' of http://34.17.75.184/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
# lib/config/localized_values.dart
# lib/core/viewModels/project_view_model.dart
# lib/uitl/translations_delegate_base.dart
|
1 year ago |
haroon amjad
|
8862cc6c06
|
Release issues resolved
|
1 year ago |
haroon amjad
|
1e98539537
|
Code merged for PenguinIn Indoor navigation into main branch
|
1 year ago |
haroon amjad
|
fd70387b2d
|
Merge branch 'dev_v3.13.6' into dev_v3.13.6_PenguinIn
# Conflicts:
# pubspec.yaml
|
1 year ago |
taha.alam
|
f80892b630
|
WD: header added to location list
|
1 year ago |
taha.alam
|
633059b0be
|
WD: Location dialog is added.
|
1 year ago |
haroon amjad
|
db91921de1
|
update to stores version 16.3
|
1 year ago |
Aamir.Muhammad
|
5883b06fcb
|
Updated to 3.24 Flutter & Penguin Fixed.
|
1 year ago |
haroon amjad
|
f42223292a
|
Merge branch 'dev_v3.13.6' into dev_v_3.13.6_CR_6804
# Conflicts:
# lib/config/config.dart
|
1 year ago |
haroon amjad
|
536c95c825
|
Merge branch 'dev_v3.13.6' into dev_3.13.6_CR6750
# Conflicts:
# lib/config/localized_values.dart
# lib/pages/landing/landing_page.dart
# lib/uitl/translations_delegate_base.dart
# lib/widgets/drawer/app_drawer_widget.dart
|
1 year ago |
haroon amjad
|
dc17576c26
|
Flutter version upgraded to 3.22.0
|
1 year ago |
haroon amjad
|
f714d17686
|
fixes
|
1 year ago |
haroon amjad
|
f8d797f80a
|
updates
|
1 year ago |
haroon amjad
|
98389e3f68
|
LiveCare Call Type implemented
|
1 year ago |
haroon amjad
|
9f629afb9c
|
Merge branch 'dev_v3.13.6' into dev_v_3.13.6_CR_6804
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/uitl/app_shared_preferences.dart
|
1 year ago |
haroon amjad
|
50ba0372db
|
language updates
|
1 year ago |
haroon amjad
|
34778d91d7
|
language fixes
|
1 year ago |
haroon amjad
|
a39d2840e0
|
Merge branch 'dev_v3.13.6' into dev_v_3.13.6_CR_6804
|
1 year ago |
haroon amjad
|
ed037edf22
|
Apple Pay fixes
|
1 year ago |
haroon amjad
|
11a43eb0ae
|
updates
|
1 year ago |
haroon amjad
|
0eaeb75207
|
Merge branch 'dev_v3.13.6' into dev_3.13.6_CR6750
|
1 year ago |
Aamir.Muhammad
|
4c5ba6048f
|
CR Fixes Search By Clinic & Search By Doctor List Reload Issue
|
1 year ago |
haroon amjad
|
ca8533190a
|
Walkin appointment booking implementation contd
|
1 year ago |
haroon amjad
|
adf00e101f
|
Merge branch 'dev_v3.13.6' into dev_3.13.6_Development
|
1 year ago |
haroon amjad
|
d65325f998
|
Payment flow integration for Walk-In appointments
|
1 year ago |
Sultan khan
|
9501c2ea9a
|
derma CR 6804 CHANGES and language on initial load issue fix.
|
2 years ago |
haroon amjad
|
d0e743dcc9
|
Family members issue fixed in android
|
2 years ago |
haroon amjad
|
752d5e5944
|
Appointment timeline fix
|
2 years ago |
haroon amjad
|
84159656b6
|
updates for ER Online-Checkin
|
2 years ago |
haroon amjad
|
2b560840aa
|
lab special result fix
|
2 years ago |
haroon amjad
|
5b7b40c732
|
Updates & fixes
|
2 years ago |
Aamir.Muhammad
|
d9cf383648
|
Merge branch 'refs/heads/development_v3.3' into dev_v3.13.6
# Conflicts:
# lib/config/config.dart
# lib/core/service/client/base_app_client.dart
# lib/pages/MyAppointments/AppointmentDetails.dart
# lib/pages/MyAppointments/widgets/AppointmentActions.dart
# lib/pages/login/confirm-login.dart
# lib/pages/medical/reports/report_home_page.dart
|
2 years ago |
haroon amjad
|
3a65113149
|
Update to stores 15.7
|
2 years ago |
Sultan khan
|
21e4bb5138
|
error code 699 fixes
|
2 years ago |
Aamir.Muhammad
|
29c2fd067e
|
Null fixes after merge from 3.13
|
2 years ago |
Aamir.Muhammad
|
8441a0ef00
|
Merge remote-tracking branch 'origin/development_v3.3' into dev_v3.13.6
# Conflicts:
# lib/pages/login/login.dart
# lib/pages/medical/medical_profile_page_new.dart
# lib/services/clinic_services/get_clinic_service.dart
# lib/uitl/utils.dart
# lib/widgets/dialogs/radio_selection_dialog.dart
|
2 years ago |
haroon amjad
|
9a102be7c7
|
PatientID QR image added
|
2 years ago |
haroon amjad
|
6e30df2a29
|
WeCare service added
|
2 years ago |
Sultan khan
|
c9be715436
|
Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/core/service/client/base_app_client.dart
# lib/pages/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart
# lib/pages/Blood/blood_donation.dart
# lib/pages/BookAppointment/BookSuccess.dart
# lib/pages/MyAppointments/AppointmentDetails.dart
# lib/pages/MyAppointments/widgets/AppointmentActions.dart
# lib/pages/ToDoList/ToDo.dart
# lib/pages/livecare/widgets/clinic_list.dart
# lib/pages/medical/balance/confirm_payment_page.dart
|
2 years ago |
haroon amjad
|
69e64fd5fb
|
Blood Donation CR merged into dev_3.3
|
2 years ago |
haroon amjad
|
f8e7ccf73f
|
updates
|
2 years ago |
haroon amjad
|
3dffb26aee
|
updates
|
2 years ago |
Sultan khan
|
5e9d08b9aa
|
Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
# lib/config/config.dart
|
2 years ago |
Sultan khan
|
08b4c8f86e
|
Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
# ios/Runner.xcodeproj/project.pbxproj
# lib/config/config.dart
# lib/core/viewModels/project_view_model.dart
# lib/main.dart
# lib/pages/BookAppointment/BookConfirm.dart
# lib/pages/landing/landing_page.dart
# lib/pages/livecare/widgets/LiveCareHistoryCard.dart
# lib/pages/medical/eye/ContactLensPage.dart
# lib/pages/medical/medical_profile_page_new.dart
# lib/uitl/LocalNotification.dart
# lib/uitl/gif_loader_dialog_utils.dart
# lib/widgets/Loader/gif_loader_container.dart
# lib/widgets/data_display/medical/time_line_new_widget.dart
# lib/widgets/drawer/app_drawer_widget.dart
# pubspec.yaml
|
2 years ago |
haroon amjad
|
968e59707e
|
updates
|
2 years ago |
haroon amjad
|
d6dacfb743
|
Load more added in appointments timeline.
|
2 years ago |
haroon amjad
|
5256d8873f
|
ToDo & Appo Timeline changes
|
2 years ago |
haroon amjad
|
fe37de9621
|
Loading dialog updates
|
2 years ago |
haroon amjad
|
727a9f1363
|
updates & checks
|
2 years ago |
Aamir Muhammad
|
b6d222a7ea
|
JIRA Fixes
|
2 years ago |
Sultan khan
|
a4ed832147
|
Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
# lib/config/config.dart
# lib/pages/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart
# lib/pages/BookAppointment/BookSuccess.dart
# lib/pages/Covid-DriveThru/covid-payment-summary.dart
# lib/pages/ErService/AmbulanceRequestIndexPages/AmbulanceRequestIndex.dart
# lib/pages/ErService/AmbulanceRequestIndexPages/PickupLocation.dart
# lib/pages/ErService/AmbulanceRequestIndexPages/SelectTransportationMethod.dart
# lib/pages/ErService/AmbulanceRequestIndexPages/Summary.dart
# lib/pages/ErService/OrderLogPage.dart
# lib/pages/ErService/rapid-response-team/rrt-request-page.dart
# lib/pages/ToDoList/ToDo.dart
# lib/pages/livecare/widgets/clinic_list.dart
# lib/pages/medical/balance/confirm_payment_page.dart
# lib/services/payfort_services/payfort_service.dart
# lib/services/payfort_services/payfort_view_model.dart
# lib/splashPage.dart
# pubspec.yaml
|
2 years ago |
haroon amjad
|
46ad672649
|
Apple Pay fixes
|
2 years ago |
Sultan khan
|
6983e309e0
|
Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
# android/build.gradle
# android/gradle.properties
# ios/Runner.xcodeproj/project.pbxproj
# lib/config/config.dart
# lib/core/model/prescriptions/prescription_report_inp.dart
# lib/pages/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart
# lib/pages/BookAppointment/BookSuccess.dart
# lib/pages/BookAppointment/DentalComplaints.dart
# lib/pages/BookAppointment/DoctorProfile.dart
# lib/pages/BookAppointment/components/DocAvailableAppointments.dart
# lib/pages/BookAppointment/widgets/DoctorView.dart
# lib/pages/ToDoList/ObGyne/ObGyne-TimeSlots.dart
# lib/pages/ToDoList/ToDo.dart
# lib/pages/livecare/widgets/clinic_list.dart
# lib/pages/medical/balance/confirm_payment_page.dart
# lib/services/appointment_services/GetDoctorsList.dart
# lib/services/clinic_services/get_clinic_service.dart
# pubspec.yaml
|
2 years ago |
haroon amjad
|
6e558bf5a6
|
Splash fix
|
2 years ago |
haroon amjad
|
180cc43705
|
Update to stores
|
2 years ago |
Sultan khan
|
30c14c2167
|
Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
# ios/Runner.xcodeproj/project.pbxproj
# ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
# lib/core/model/reports/Reports.dart
# lib/core/service/client/base_app_client.dart
# lib/core/viewModels/medical/ask_doctor_view_model.dart
# lib/pages/BookAppointment/BookConfirm.dart
# lib/pages/BookAppointment/BookSuccess.dart
# lib/pages/BookAppointment/DoctorProfile.dart
# lib/pages/BookAppointment/QRCode.dart
# lib/pages/Covid-DriveThru/Covid-TimeSlots.dart
# lib/pages/DrawerPages/family/my-family.dart
# lib/pages/MyAppointments/AppointmentDetails.dart
# lib/pages/MyAppointments/MyAppointments.dart
# lib/pages/MyAppointments/widgets/PrescriptionReport.dart
# lib/pages/ToDoList/ObGyne/ObGyne-TimeSlots.dart
# lib/pages/ToDoList/ToDo.dart
# lib/pages/medical/eye/EyeHomePage.dart
# lib/pages/medical/reports/report_list_widget.dart
# lib/services/appointment_services/GetDoctorsList.dart
# lib/uitl/location_util.dart
# lib/uitl/utils.dart
# lib/widgets/drawer/app_drawer_widget.dart
# pubspec.yaml
|
2 years ago |
haroon amjad
|
ac52ba75a7
|
Updates & Fixes
|
2 years ago |
haroon amjad
|
86d3e03c06
|
Updates
|
2 years ago |
haroon amjad
|
37aa700b2e
|
fixes
|
2 years ago |
haroon amjad
|
e5d8505c2d
|
Updates & fixes
|
2 years ago |
Sultan khan
|
4b28581c55
|
Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
# lib/config/localized_values.dart
# lib/core/service/client/base_app_client.dart
# lib/models/Appointments/toDoCountProviderModel.dart
# lib/pages/MyAppointments/AppointmentDetails.dart
# lib/pages/MyAppointments/MyAppointments.dart
# lib/pages/ToDoList/ObGyne/ObGyne-TimeSlots.dart
# lib/pages/ToDoList/ToDo.dart
# lib/pages/login/login.dart
# lib/services/authentication/auth_provider.dart
# lib/widgets/drawer/app_drawer_widget.dart
|
2 years ago |
haroon amjad
|
75bfeaa716
|
My appointment fixes
|
2 years ago |
haroon amjad
|
3401496739
|
Updates & fixes
|
2 years ago |
Sultan khan
|
86f5e81fea
|
merge with 3.3
|
2 years ago |
Sultan khan
|
d0c7b08eac
|
Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
Conflicts:
lib/config/config.dart
lib/core/service/client/base_app_client.dart
lib/core/viewModels/er/EdOnlineViewModel.dart
lib/pages/AlHabibMedicalService/health_calculator/bmi_calculator/bariatrics-screen.dart
lib/pages/BookAppointment/DentalComplaints.dart
lib/pages/BookAppointment/components/SearchByClinic.dart
lib/pages/BookAppointment/widgets/DentalComplaintCard.dart
lib/pages/BookAppointment/widgets/DoctorView.dart
lib/pages/DrawerPages/family/my-family.dart
lib/pages/MyAppointments/MyAppointments.dart
lib/pages/landing/landing_page.dart
lib/pages/livecare/widgets/clinic_card.dart
lib/pages/login/login.dart
lib/pages/rateAppointment/rate_appointment_clinic.dart
lib/pages/rateAppointment/rate_appointment_doctor.dart
lib/services/clinic_services/get_clinic_service.dart
lib/uitl/push-notification-handler.dart
lib/widgets/others/bottom_bar.dart
pubspec.yaml
|
2 years ago |
haroon amjad
|
fddb423451
|
Updates & fixes
|
2 years ago |
haroon amjad
|
aa04e943ef
|
updates & fixes
|
2 years ago |
haroon amjad
|
4ac11b2169
|
LanguageID Fixes
|
2 years ago |
Sultan khan
|
4338da513d
|
Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
# lib/config/config.dart
# lib/core/model/labs/patient_lab_orders.dart
# lib/core/model/labs/request_patient_lab_special_result.dart
# lib/core/model/labs/request_send_lab_report_email.dart
# lib/core/model/radiology/final_radiology.dart
# lib/core/model/radiology/request_send_rad_report_email.dart
# lib/core/model/rate/appoitment_rated.dart
# lib/core/service/client/base_app_client.dart
# lib/core/service/medical/labs_service.dart
# lib/core/service/medical/radiology_service.dart
# lib/core/viewModels/medical/labs_view_model.dart
# lib/core/viewModels/medical/radiology_view_model.dart
# lib/models/Authentication/check_activation_code_request.dart
# lib/models/FamilyFiles/GetAllSharedRecordsByStatusReq.dart
# lib/pages/BookAppointment/BookSuccess.dart
# lib/pages/BookAppointment/QRCode.dart
# lib/pages/DrawerPages/family/my-family.dart
# lib/pages/DrawerPages/notifications/notification_details_page.dart
# lib/pages/MyAppointments/AppointmentDetails.dart
# lib/pages/MyAppointments/MyAppointments.dart
# lib/pages/MyAppointments/widgets/AppointmentActions.dart
# lib/pages/ToDoList/ToDo.dart
# lib/pages/landing/landing_page.dart
# lib/pages/livecare/widgets/clinic_list.dart
# lib/pages/login/confirm-login.dart
# lib/pages/login/login.dart
# lib/pages/medical/labs/laboratory_result_page.dart
# lib/pages/medical/radiology/radiology_details_page.dart
# lib/services/authentication/auth_provider.dart
# lib/splashPage.dart
# lib/uitl/push-notification-handler.dart
# lib/widgets/drawer/app_drawer_widget.dart
|
2 years ago |
haroon amjad
|
512db615be
|
Language ID fixes & app update to stores, VersionID 11.5
|
2 years ago |
haroon amjad
|
f7dffea2eb
|
Language ID fixes
|
2 years ago |
haroon amjad
|
724a26ca68
|
Updates
|
2 years ago |