Sultan Khan
|
5fe6a6c3dd
|
doctor schedule
|
3 years ago |
Sikander Saleem
|
4152eafa17
|
Merge branch 'development_new_design_2.0' into new_design_sikander
|
3 years ago |
Sikander Saleem
|
2ba91e54ab
|
merge-changes
|
3 years ago |
Sikander Saleem
|
970887b0c5
|
changes
|
3 years ago |
Elham Rababh
|
ceeda154d5
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into foote_in_all_pages
Conflicts:
lib/pages/landing/landing_page.dart
|
3 years ago |
Sikander Saleem
|
bb18645d85
|
Merge branch 'development' into development_new_design_2.0
# Conflicts:
# lib/config/localized_values.dart
# lib/pages/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart
# lib/pages/MyAppointments/AppointmentDetails.dart
# lib/pages/landing/landing_page.dart
# lib/pages/medical/medical_profile_page.dart
# lib/uitl/translations_delegate_base.dart
|
3 years ago |
Sikander Saleem
|
e9db30d3da
|
otp clear when wrong code entered.
|
3 years ago |
Sultan Khan
|
301728ed3d
|
family file fix
|
3 years ago |
Sultan Khan
|
59892870e2
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
3 years ago |
Sultan Khan
|
9e31a3c560
|
bug fixes
|
3 years ago |
Sikander Saleem
|
5ab9dd1761
|
Appointment screen Changes & improvements.
|
3 years ago |
haroon amjad
|
3f29bbd6b3
|
Updates & fixes
|
3 years ago |
Mohammad Aljammal
|
db128e5091
|
Merge branch 'blood_pressure' into 'development'
fix prescription add reminder
See merge request Cloud_Solution/diplomatic-quarter!363
|
3 years ago |
Elham Rababh
|
1fefbfb76e
|
return bottom sheet inside appointments list
|
3 years ago |
Sultan Khan
|
57d87dfc03
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
3 years ago |
Sultan Khan
|
11ffed2ae3
|
bug fixes
|
3 years ago |
Elham Rababh
|
ab2fc6aa2c
|
fix issues related to footer
|
3 years ago |
hussam al-habibeh
|
428b45528b
|
fix prescription add reminder
|
3 years ago |
Sikander Saleem
|
197e7d5742
|
Merge branch 'development' into development_new_design_2.0
# Conflicts:
# lib/config/localized_values.dart
# lib/pages/medical/patient_sick_leave_page.dart
# lib/uitl/translations_delegate_base.dart
# lib/uitl/utils.dart
|
3 years ago |
Mohammad Aljammal
|
d9fabbab17
|
Fix feedback
|
3 years ago |
Sikander Saleem
|
5b778f0493
|
appointment ui (cont.) & improvement.
|
3 years ago |
haroon amjad
|
a32501f3dc
|
My invoices implementation continued
|
3 years ago |
haroon amjad
|
90db04cee1
|
Jira Fixes
|
3 years ago |
haroon amjad
|
5007064105
|
Jira fixes
|
3 years ago |
haroon amjad
|
7b6270c67f
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
|
3 years ago |
mosazaid
|
116a4af845
|
fix-design
|
4 years ago |
haroon amjad
|
f754e48034
|
Merge branch 'development' into Haroon
# Conflicts:
# lib/widgets/in_app_browser/InAppBrowser.dart
|
4 years ago |
mosazaid
|
e5474b3062
|
fix perscription pages bugs
|
4 years ago |
haroon amjad
|
accc39d972
|
jira bug fixes
|
4 years ago |
haroon amjad
|
da3ad90ddd
|
added app-wide route transition animation
|
4 years ago |
haroon amjad
|
deb0b40cfe
|
fixes
|
4 years ago |
haroon amjad
|
7c538b350f
|
LiveCare Scheduling finalized, Appointments in ToDo list categorized
|
4 years ago |
Mohammad Aljammal
|
298b4d6525
|
change color
|
4 years ago |
Mohammad Aljammal
|
18dad434a0
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into merge_dq_master
Conflicts:
lib/config/config.dart
lib/core/service/client/base_app_client.dart
lib/core/service/weather_service.dart
lib/core/viewModels/dashboard_view_model.dart
lib/main.dart
lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
lib/pages/AlHabibMedicalService/health-weather/health-weather-indicator.dart
lib/pages/BookAppointment/Search.dart
lib/pages/ErService/AmbulanceReq.dart
lib/pages/MyAppointments/widgets/AppointmentCardView.dart
lib/pages/ToDoList/ToDo.dart
lib/pages/landing/home_page.dart
lib/pages/landing/landing_page.dart
lib/pages/login/login.dart
lib/pages/login/register.dart
lib/pages/medical/allergies_page.dart
lib/pages/medical/balance/advance_payment_page.dart
lib/pages/medical/doctor/doctor_home_page.dart
lib/pages/medical/medical_profile_page.dart
lib/pages/medical/prescriptions/prescriptions_home_page.dart
lib/pages/medical/vital_sign/vital_sign_details_screen.dart
lib/uitl/location_util.dart
lib/widgets/drawer/app_drawer_widget.dart
pubspec.yaml
|
4 years ago |
Mohammad Aljammal
|
519a474d41
|
fix live care label and vital sign data
|
4 years ago |
Mohammad Aljammal
|
591d56e624
|
change the info images and change the out patient color
|
4 years ago |
Mohammad Aljammal
|
5e29dff448
|
fix issues insurance and medical profile order
|
4 years ago |
Haroon Amjad
|
b0ea1fc262
|
updates & fixes
|
4 years ago |
haroon amjad
|
8c9762c24f
|
Fixes
|
4 years ago |
Mohammad Aljammal
|
7bc8fdb819
|
fix merge issues
|
4 years ago |
Mohammad Aljammal
|
a57d5eb69f
|
hot fixes
|
4 years ago |
Mohammad Aljammal
|
8329c534a3
|
hot fixes
|
4 years ago |
Mohammad Aljammal
|
7167d58ce2
|
fix merge issues
|
4 years ago |
Mohammad Aljammal
|
aa89a05f1d
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter
Conflicts:
ios/Flutter/.last_build_id
lib/config/config.dart
lib/config/localized_values.dart
lib/config/shared_pref_kay.dart
lib/core/service/client/base_app_client.dart
lib/core/service/medical/prescriptions_service.dart
lib/core/viewModels/project_view_model.dart
lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
lib/pages/BookAppointment/BookConfirm.dart
lib/pages/BookAppointment/DoctorProfile.dart
lib/pages/DrawerPages/family/my-family.dart
lib/pages/MyAppointments/MyAppointments.dart
lib/pages/MyAppointments/models/ArrivedButtons.dart
lib/pages/MyAppointments/widgets/AppointmentActions.dart
lib/pages/MyAppointments/widgets/AppointmentCardView.dart
lib/pages/ToDoList/ToDo.dart
lib/pages/feedback/send_feedback_page.dart
lib/pages/insurance/insurance_approval_screen.dart
lib/pages/insurance/insurance_card_screen.dart
lib/pages/landing/home_page.dart
lib/pages/landing/landing_page.dart
lib/pages/login/confirm-login.dart
lib/pages/login/login.dart
lib/pages/medical/balance/my_balance_page.dart
lib/pages/medical/labs/laboratory_result_page.dart
lib/pages/medical/labs/labs_home_page.dart
lib/pages/medical/medical_profile_page.dart
lib/pages/medical/patient_sick_leave_page.dart
lib/pages/medical/prescriptions/prescription_details_page.dart
lib/pages/medical/prescriptions/prescription_items_page.dart
lib/pages/medical/radiology/radiology_details_page.dart
lib/pages/medical/radiology/radiology_home_page.dart
lib/pages/medical/reports/report_home_page.dart
lib/pages/medical/reports/reports_page.dart
lib/pages/pharmacies/pharmacies_list_screen.dart
lib/pages/settings/profile_setting.dart
lib/services/authentication/auth_provider.dart
lib/uitl/translations_delegate_base.dart
lib/widgets/buttons/floatingActionButton.dart
lib/widgets/data_display/medical/LabResult/LabResultWidget.dart
lib/widgets/data_display/medical/LabResult/laboratory_result_widget.dart
lib/widgets/data_display/medical/doctor_card.dart
lib/widgets/drawer/app_drawer_widget.dart
lib/widgets/others/app_scaffold_widget.dart
|
4 years ago |
haroon amjad
|
781fd1c287
|
Merge branch 'diplomatic-quarter-live' into diplomatic-quarter-haroon
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
|
4 years ago |
Haroon Amjad
|
3308aa47e1
|
fixes
|
4 years ago |
haroon amjad
|
bf999e611b
|
my appointment fix
|
4 years ago |
Haroon Amjad
|
b9269f525a
|
hot fixes
|
4 years ago |
haroon amjad
|
051bd1e23f
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
|
4 years ago |
haroon amjad
|
9d046fd971
|
updates & fixes
|
4 years ago |
haroon amjad
|
740a294867
|
Translation & bug fixes
|
4 years ago |
haroon amjad
|
9ecaaa1b12
|
radiology fix in appointment details
|
4 years ago |
Haroon Amjad
|
9d3c64200e
|
fixes
|
4 years ago |
haroon amjad
|
c4bb75eab4
|
Doctor rating fixed
|
4 years ago |
haroon amjad
|
a1f91d99b3
|
added countdown timer in my appointments
|
4 years ago |
haroon amjad
|
dfa1952f4d
|
Implemented countdown timer in ToDo list & removed Smart progress bar from the whole app
|
4 years ago |
haroon amjad
|
f1a8e09a59
|
Added info images description
|
4 years ago |
Zohaib Kambrani
|
27182ee8db
|
no message
|
4 years ago |
haroon amjad
|
e5feef8a9d
|
Updates & UI Fixes
|
4 years ago |
haroon amjad
|
21c7c94ef2
|
updates & fixes
|
4 years ago |
haroon amjad
|
b81af62551
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
|
4 years ago |
Mohammad Aljmma
|
216c5609c6
|
fix issue # 6 & 7 & 8
|
4 years ago |
Mohammad Aljmma
|
e1f6ef5e5b
|
fix Prescriptions history
|
4 years ago |
haroon amjad
|
9096ccd4d4
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
|
4 years ago |
haroon amjad
|
10efccbce8
|
my appointment fixes
|
4 years ago |
haroon amjad
|
ff3368eefb
|
Login check implemented for appointment & ToDo
|
4 years ago |
haroon amjad
|
1553e71e7d
|
New loading dialog added into appointment flow
|
4 years ago |
haroon amjad
|
3354058738
|
Branding updated according to DQ
|
4 years ago |
haroon amjad
|
dfa7e0e02f
|
updates & fixes
|
4 years ago |
Mohammad Aljammal
|
29f0402cbd
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
Conflicts:
lib/config/config.dart
lib/config/shared_pref_kay.dart
lib/core/service/client/base_app_client.dart
lib/pages/AlHabibMedicalService/ health_calculators.dart
lib/pages/ContactUs/LiveChat/hospitalsLivechat_page.dart
lib/pages/MyAppointments/widgets/AppointmentCardView.dart
lib/pages/login/confirm-login.dart
lib/pages/login/login.dart
lib/services/appointment_services/GetDoctorsList.dart
lib/uitl/translations_delegate_base.dart
lib/widgets/drawer/app_drawer_widget.dart
lib/widgets/others/app_scaffold_widget.dart
|
4 years ago |
Sultan Khan
|
8f18d1025a
|
voice search
|
4 years ago |
haroon amjad
|
7fdc0da9dc
|
livecare scheduling implemented
|
4 years ago |
haroon amjad
|
c9256a654a
|
LiveCare Scheduling updates
|
4 years ago |
Sultan Khan
|
0a2cb22042
|
design issues fixed
|
4 years ago |
haroon amjad
|
cbf19f0cd1
|
Merge branch 'master' into 'Haroon'
# Conflicts:
# lib/core/service/client/base_app_client.dart
|
4 years ago |
Mohammad Aljammal
|
b0f0b87345
|
fix merge issues
|
4 years ago |
haroon amjad
|
c5794e5c70
|
Dental flow in my appointments
|
4 years ago |
Mohammad Aljammal
|
68466c8d03
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into dashboard
Conflicts:
lib/config/localized_values.dart
lib/core/service/client/base_app_client.dart
lib/models/Appointments/DoctorListResponse.dart
lib/pages/BookAppointment/widgets/DoctorView.dart
lib/pages/MyAppointments/MyAppointments.dart
lib/uitl/translations_delegate_base.dart
pubspec.yaml
|
4 years ago |
haroon amjad
|
3e5ef26b29
|
my appointment sorting implemented
|
4 years ago |
Mohammad Aljammal
|
ef4a57223c
|
fix DoctorView.dart UI issues
|
4 years ago |
haroon amjad
|
db30fbdfd2
|
implementing livecare
|
4 years ago |
haroon amjad
|
59c279998c
|
working on vital signs integration
|
4 years ago |
haroon amjad
|
3b881f1ab3
|
appointment details scenarios handled
|
4 years ago |
haroon amjad
|
7972d01dff
|
Insurance Approval implemented
|
4 years ago |
haroon amjad
|
750746aabe
|
updates & fixes
|
4 years ago |
haroon amjad
|
c50530734d
|
added my appointments in medical file page
|
4 years ago |
Haroon Amjad
|
8ad2941836
|
Appointment payment finalised, Ask Doc implemeted & other updates
|
4 years ago |
Haroon Amjad
|
41c922bfeb
|
Appointment payment implemented, Book Success implemented, Appointment flow implemented
|
4 years ago |
haroon amjad
|
28fde5c500
|
My Appointments implemented, Appointment Details functionality updated, Logged In User details added in APIs & other updates
|
4 years ago |
haroon amjad
|
b3e5047820
|
Payment method selection page created, Appointment details functions implemented
|
4 years ago |
haroon amjad
|
06f95c5379
|
Appointment Details implementation continued
|
4 years ago |
haroon amjad
|
049d455e3c
|
Implementing appointment details functions
|
4 years ago |
haroon amjad
|
f5ddfabf50
|
Todo list implemented, Appointment details implemented, Appointment Reschedule implemented, Appointment Confirmed implemented
|
4 years ago |
Haroon Amjad
|
9eb9f01dbd
|
Get Clinic List API Implemented, Architecture for HTTP requests implemented
|
4 years ago |
haroon amjad
|
a0173c5b4d
|
Appointment Details page, ToDo List Page implemented
|
4 years ago |