haroon amjad
|
091f3b0830
|
CRs 5656, 5801 & 6265 (InPatient CRs & ER Online Check-In) update to stores with versionID 16.8
|
1 year ago |
haroon amjad
|
7188919172
|
Updates & fixes
|
1 year ago |
haroon amjad
|
82de56266e
|
InPatient Services issues fixed
|
1 year ago |
haroon amjad
|
71542e9db6
|
Inpatient module code merged & code fixes
|
1 year ago |
haroon amjad
|
6a555ace41
|
ER Online CheckIn & InPatient CR implemented
|
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 |
taha.alam
|
936682ff95
|
WD: clinic by hospital
|
1 year ago |
haroon amjad
|
b6adfb2534
|
ER Online Check-In CR implemented
|
1 year ago |
haroon amjad
|
34778d91d7
|
language fixes
|
1 year ago |
haroon amjad
|
f65fe26fd2
|
ER Online CheckIn implementation contd
|
2 years ago |
haroon amjad
|
f5df1b1d01
|
ER Online CheckIn implementation Contd
|
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
|
6e30df2a29
|
WeCare service added
|
2 years ago |
Sultan khan
|
0e04012219
|
Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
# lib/pages/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart
# lib/pages/BookAppointment/DentalComplaints.dart
# lib/pages/MyAppointments/MyAppointments.dart
# lib/services/clinic_services/get_clinic_service.dart
|
2 years ago |
haroon amjad
|
e0ae8d7c8e
|
Updates & fixes
|
2 years ago |
Sultan khan
|
735582e3ab
|
updated code.
|
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
|
7850748ea2
|
Dental updates
|
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 |
Sultan khan
|
c1fbce7eae
|
bug 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
|
f7dffea2eb
|
Language ID fixes
|
2 years ago |
Aamir Muhammad
|
77651f9652
|
Merge remote-tracking branch 'origin/Dev_3.3_InPatient_CR' into dev_v3.13.6
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/core/service/client/base_app_client.dart
# lib/core/viewModels/project_view_model.dart
# lib/pages/BookAppointment/BookSuccess.dart
# lib/pages/MyAppointments/MyAppointments.dart
# lib/pages/insurance/AttachInsuranceCardImageDialog.dart
# lib/pages/login/confirm-login.dart
# lib/pages/paymentService/payment_service.dart
# lib/uitl/push-notification-handler.dart
# lib/uitl/translations_delegate_base.dart
# lib/uitl/utils.dart
# lib/uitl/utils_new.dart
# lib/widgets/avatar/large_avatar.dart
# lib/widgets/bottom_navigation/bottom_navigation_item.dart
# lib/widgets/bottom_options/BottomSheet.dart
# lib/widgets/data_display/medical/medical_profile_item.dart
# lib/widgets/drawer/app_drawer_widget.dart
# pubspec.yaml
|
2 years ago |
devamirsaleemahmad
|
d73cc13100
|
Merge branch 'development_v3.3' into dev_v3.13.6
# Conflicts:
# lib/config/config.dart
# lib/core/service/client/base_app_client.dart
# lib/pages/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart
# lib/pages/BookAppointment/QRCode.dart
# lib/pages/MyAppointments/widgets/AppointmentActions.dart
# lib/pages/ToDoList/ToDo.dart
# lib/pages/landing/fragments/home_page_fragment2.dart
# lib/splashPage.dart
# lib/uitl/utils.dart
|
2 years ago |
haroon amjad
|
cb9ced27c2
|
updates
|
2 years ago |
haroon amjad
|
1ecb8ebfe9
|
updated to stores version 11.3
|
2 years ago |
haroon amjad
|
41cd55e02b
|
paymentRequestID added in the request
|
2 years ago |
Sultan khan
|
c63a1fadf5
|
code updated in-progress
|
2 years ago |
haroon amjad
|
0f4f98f31c
|
fixes
|
2 years ago |
haroon amjad
|
6f20f1b871
|
InPatient Discharge Medications
|
2 years ago |
haroon amjad
|
3642ca6a47
|
InPatient advance payment updates
|
2 years ago |
haroon amjad
|
4a7ca9cd46
|
InPatient advance payment history implemented
|
2 years ago |
haroon amjad
|
ae0fca865d
|
InPatient Advance payment API implemented
|
2 years ago |
haroon amjad
|
dd79b1dfca
|
InPatient pending advance payment done
|
2 years ago |
haroon amjad
|
d251ca0e1c
|
Inpatient medical instructions implemented
|
2 years ago |
haroon amjad
|
d261557cd7
|
Admitted patient API changed
|
2 years ago |
haroon amjad
|
0e054429ef
|
Meal Plan implementation completed
|
3 years ago |
haroon amjad
|
38648df897
|
Meal Plan development continued
|
3 years ago |
haroon amjad
|
d073eb9d5f
|
MealPlan implementation continued
|
3 years ago |
haroon amjad
|
77ab9373f8
|
Meal Plan APIs implementation continued
|
3 years ago |
haroon amjad
|
710e6274db
|
mealplan updates
|
3 years ago |
haroon amjad
|
9f44b25353
|
Meal Plan API integration in progress
|
3 years ago |
haroon amjad
|
60d5ba4a9e
|
Birth Notification implemented
|
3 years ago |
haroon amjad
|
078482c21d
|
updates
|
3 years ago |
haroon amjad
|
2fea4b2b07
|
Merge branch 'development_v3.3' into Dev_3.3_InPatient_CR
# Conflicts:
# lib/config/config.dart
# lib/pages/landing/fragments/home_page_fragment2.dart
# lib/pages/landing/widgets/services_view.dart
|
3 years ago |
haroon amjad
|
9d2df00d87
|
Get General instructions implemented
|
3 years ago |
Sultan khan
|
c48f393f95
|
Dubai registration fixed
|
3 years ago |