taha.alam
|
4c4ae6caef
|
WD: Translation of words added and download button added
|
1 year ago |
taha.alam
|
3d27fbdea8
|
WD: lab report changes
|
1 year ago |
taha.alam
|
8509c3d94d
|
WD: picking otp and providing the code to flutter channel
|
1 year ago |
taha.alam
|
ff7afe5997
|
WD: vital sign camera screen added
|
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
|
32cf61d1bf
|
Download & Share options added for Ready Medical Report.
|
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
|
e0de0768b6
|
CR 7241 changes, ProjectID added in radiology results if navigating from appointment details
|
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
|
291cf16d22
|
Changes for Laser clinic full body part
|
1 year ago |
haroon amjad
|
baa7790b89
|
Patient occupation selection implemented
|
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
|
931e748a54
|
updates
|
1 year ago |
haroon amjad
|
20bfdc3652
|
Project Name Top & Bottom changes implemented
|
1 year ago |
haroon amjad
|
8e46738982
|
bug fixes
|
1 year ago |
haroon amjad
|
41b0e65e41
|
iOS Calendar fix
|
1 year ago |
haroon amjad
|
068b6c8494
|
calendar events updates
|
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
|
71542e9db6
|
Inpatient module code merged & code fixes
|
1 year ago |
haroon amjad
|
42dbe066fd
|
Merge branch 'dev_3.3_ER_Online_CheckIn' into dev_3.13.6_merge_ER_Online_CheckIn
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/pages/landing/fragments/home_page_fragment2.dart
# lib/pages/landing/widgets/services_view.dart
# lib/services/payfort_services/payfort_service.dart
# lib/services/payfort_services/payfort_view_model.dart
# lib/uitl/translations_delegate_base.dart
|
1 year ago |
haroon amjad
|
18b4fc5317
|
Patient app update
|
1 year ago |
haroon amjad
|
3d44aa2e64
|
Sickleave updates
|
1 year ago |
haroon amjad
|
605f02afe2
|
Sickleave CR updates & changes
|
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
|
cee903dd6b
|
changes for the hospital gesture clicked area and nearest check not showing the hospital dropdown area
|
1 year ago |
haroon amjad
|
a6ee6869cc
|
Merge commit '81b94814ce4f0a1e4626fe07a9b7933246d71336' into dev_v3.13.6
|
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 |
taha.alam
|
936682ff95
|
WD: clinic by hospital
|
1 year ago |
haroon amjad
|
fd70387b2d
|
Merge branch 'dev_v3.13.6' into dev_v3.13.6_PenguinIn
# Conflicts:
# pubspec.yaml
|
1 year ago |
haroon amjad
|
06c0580d84
|
updates
|
1 year ago |
taha.alam
|
633059b0be
|
WD: Location dialog is added.
|
1 year ago |
Haroon Amjad
|
49c11537b3
|
updated to latest flutter 3.24
|
1 year ago |
Aamir.Muhammad
|
e045c375d2
|
Merge branch 'refs/heads/dev_v3.13.6' into dev_v3.13.6_PenguinIn_3.22-IOS
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
|
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
|
6f0cfebc89
|
Translation updates as requested by QA
|
1 year ago |
haroon amjad
|
b6adfb2534
|
ER Online Check-In CR implemented
|
1 year ago |
Haroon Amjad
|
1c66351011
|
Updates & fixes
|
1 year ago |
Aamir.Muhammad
|
145cd6010a
|
Merge remote-tracking branch 'origin/dev_v3.13.6_PenguinIn' into dev_v3.13.6_PenguinIn
|
1 year ago |
Aamir.Muhammad
|
7065b00c5c
|
Penguin Map Integration & Permissions Fixes.
|
1 year ago |
taha.alam
|
ae7fbbfb98
|
WD: penguin view navigation to clinic id added and username modified.
|
1 year ago |
haroon amjad
|
f83d538472
|
fixes
|
1 year ago |
Haroon Amjad
|
05d0d2d5a7
|
PenguinIn Params updated
|
1 year ago |
Haroon Amjad
|
6efb316377
|
homepage updates
|
1 year ago |
Haroon Amjad
|
029f174a6c
|
Penguin scenarios implemented
|
1 year ago |
taha.alam
|
1e8953538a
|
WD: notification for navigation added
|
1 year ago |
haroon amjad
|
147fb6cee8
|
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
|
d3d8d1f121
|
Update to stores 16.0
|
1 year ago |
haroon amjad
|
50ba0372db
|
language updates
|
1 year ago |
haroon amjad
|
34778d91d7
|
language fixes
|
1 year ago |
haroon amjad
|
66ec7b5ca4
|
Derma package appointment booking fixes
|
2 years ago |
Aamir.Muhammad
|
fb4cf08b89
|
Penguin Map Integration & Permissions Fixes.
|
2 years ago |
haroon amjad
|
53015422e5
|
PenguinIn integration with HMG App
|
2 years ago |
Sultan khan
|
9501c2ea9a
|
derma CR 6804 CHANGES and language on initial load issue fix.
|
2 years ago |
haroon amjad
|
b3f2904e9a
|
Waiting appointment implementation contd.
|
2 years ago |
haroon amjad
|
52e63fe5e4
|
Update to stores 15.9
|
2 years ago |
haroon amjad
|
8a319cc2f2
|
updates & fixes
|
2 years ago |
haroon amjad
|
c948a1780c
|
Update to stores VersionID 15.8
|
2 years ago |
Aamir.Muhammad
|
515896c265
|
Calender Event Fixes
|
2 years ago |
haroon amjad
|
5b7b40c732
|
Updates & fixes
|
2 years ago |
haroon amjad
|
c97fd25cdd
|
Zoom integration updates & other stability 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
|
96d5c3ce1d
|
My Instructions added
|
2 years ago |
haroon amjad
|
5f90435442
|
National ID input validation 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 |
Aamir Muhammad
|
e18ba6822a
|
changes local
|
2 years ago |
Aamir Muhammad
|
660ec3a207
|
changes local
|
2 years ago |
Aamir Muhammad
|
52a5e978a7
|
changes local
|
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
|
fe37de9621
|
Loading dialog updates
|
2 years ago |
Sultan khan
|
eee2ccf148
|
updates
|
2 years ago |
haroon amjad
|
727a9f1363
|
updates & checks
|
2 years ago |
haroon amjad
|
162b2fd22a
|
updates
|
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
|
a12558076f
|
Merge branch 'development_v3.3' into dev_3.3_AmbulanceRequestCR
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
|
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 |
Sultan khan
|
90dc8e5e05
|
Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
# lib/core/service/client/base_app_client.dart
# lib/main.dart
# lib/models/LiveCare/ApplePayInsertRequest.dart
# lib/pages/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart
# lib/pages/BookAppointment/BookConfirm.dart
# lib/pages/BookAppointment/BookSuccess.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/uitl/gif_loader_dialog_utils.dart
# lib/uitl/location_util.dart
# pubspec.yaml
|
2 years ago |
haroon amjad
|
cb79d625d1
|
Update to stores for LiveCare fix
|
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
|
0168f06bb9
|
updates
|
2 years ago |
haroon amjad
|
1b0961a08f
|
location timeout
|
2 years ago |
haroon amjad
|
c29e2c88f0
|
location timeout handled in online check-in via location
|
2 years ago |
haroon amjad
|
bea15150aa
|
Merge branch 'development_v3.3' into dev_3.3_faiz_payfort
|
2 years ago |
haroon amjad
|
ec0bed04d3
|
Apple Pay in production implemented & tested
|
2 years ago |
haroon amjad
|
b39357a497
|
Medical report changes, Loading added in Location Check-In
|
2 years ago |
haroon amjad
|
e6d093a84c
|
updates
|
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 |
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 |