haroon amjad
|
3bb0a8b85b
|
Apple Pay finalized, Translation issues fixed, other updates
|
3 years ago |
 Sikander Saleem
|
aa047afef7
|
Merge branch 'new_design_sikander' into development_new_design_2.0
# Conflicts:
# lib/pages/BookAppointment/components/SearchByClinic.dart
|
3 years ago |
Mirza.Shafique
|
afb08fcd0a
|
Booking Filters Update
|
3 years ago |
|
Sikander Saleem
|
1db8c96ed7
|
title improvement for book appointment clinic search.
|
3 years ago |
|
haroon amjad
|
ebcc2559ce
|
Ask doctor issue resolved, Translation & font family issues resolved
|
3 years ago |
|
haroon amjad
|
25fb5decc0
|
Ask Doctor page fixes
|
3 years ago |
|
haroon amjad
|
45272d251c
|
Updates & fixes
|
3 years ago |
|
Sikander Saleem
|
ef5f737084
|
Merge branch 'development' into development_new_design_2.0
|
3 years ago |
|
haroon amjad
|
e679c7df0d
|
updates & fixes
|
3 years ago |
|
Sikander Saleem
|
62ca009404
|
improvement.
|
3 years ago |
Sultan Khan
|
ad7527ee65
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0
|
3 years ago |
|
Sultan Khan
|
233a273316
|
shcedule page
|
3 years ago |
|
Mirza.Shafique
|
3f0d8626e7
|
Marge issue
|
3 years ago |
|
Mirza.Shafique
|
590ea48ea9
|
Merge branch 'mirza_home_page' into development_new_design_2.0
# Conflicts:
# lib/pages/BookAppointment/DoctorProfile.dart
# lib/pages/BookAppointment/book_reminder_page.dart
# lib/pages/MyAppointments/SchedulePage.dart
|
3 years ago |
|
Mirza.Shafique
|
e1e3741abf
|
Event Reminder
|
3 years ago |
|
haroon amjad
|
3abd7227ec
|
fixes
|
3 years ago |
|
haroon amjad
|
9cf9e297cf
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0
# Conflicts:
# lib/pages/MyAppointments/AppointmentDetails.dart
|
3 years ago |
|
haroon amjad
|
4560037f97
|
updates
|
3 years ago |
|
Sikander Saleem
|
1a0e1f47a6
|
Merge branch 'development' into development_new_design_2.0
# Conflicts:
# lib/config/localized_values.dart
# lib/pages/BookAppointment/components/DocAvailableAppointments.dart
# lib/pages/MyAppointments/AppointmentDetails.dart
# lib/uitl/translations_delegate_base.dart
|
3 years ago |
|
Sultan Khan
|
1726f8cc11
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
3 years ago |
|
Sultan Khan
|
d1fc4751ad
|
BUG FIXES
|
3 years ago |
|
Mirza.Shafique
|
ebf293736d
|
Booking appointment Marge
|
3 years ago |
|
Sikander Saleem
|
363cf78884
|
improvement.
|
3 years ago |
|
Sikander Saleem
|
b78f8f76db
|
improvement.
|
3 years ago |
|
Sikander Saleem
|
bdb7f29d4c
|
Merge branch 'development' into development_new_design_2.0
# Conflicts:
# lib/core/service/parmacyModule/prescription_service.dart
# lib/pages/BookAppointment/DentalComplaints.dart
# lib/pages/login/login.dart
|
3 years ago |
|
Mirza.Shafique
|
089ad0d321
|
Booking appointment 1.3
|
3 years ago |
|
haroon amjad
|
e9c26ee85f
|
Dental procedures implemented
|
3 years ago |
|
Sikander Saleem
|
ca363adee2
|
merge & improvements
|
3 years ago |
Mohammad Aljammal
|
8b3a0b3ada
|
Revert "Merge branch 'foote_in_all_pages' into 'development'"
This reverts merge request !369
|
3 years ago |
|
Sikander Saleem
|
8367fc09f3
|
Merge branch 'new_design_sikander' into development_new_design_2.0
# Conflicts:
# lib/widgets/new_design/doctor_header.dart
|
3 years ago |
|
Sultan Khan
|
1a501a3b2a
|
calendar events changes
|
3 years ago |
|
Mirza.Shafique
|
ad025f3d8e
|
Booking appointment 1.2
|
3 years ago |
|
Sultan Khan
|
4325bd3448
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
3 years ago |
|
Sultan Khan
|
5fe6a6c3dd
|
doctor schedule
|
3 years ago |
|
Mirza.Shafique
|
d2b2b4063d
|
Booking appointment 1.1
|
3 years ago |
|
Mirza.Shafique
|
bd1cf9bcc7
|
Merge branch 'development_new_design_2.0' into mirza_home_page
# Conflicts:
# lib/pages/BookAppointment/components/SearchByClinic.dart
# lib/widgets/drawer/app_drawer_widget.dart
|
3 years ago |
|
Mirza.Shafique
|
62631677ad
|
Booking appointment 1.0
|
3 years ago |
|
Sikander Saleem
|
4152eafa17
|
Merge branch 'development_new_design_2.0' into new_design_sikander
|
3 years ago |
|
Sikander Saleem
|
94ff5cff40
|
Merge branch 'development' into development_new_design_2.0
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
|
3 years ago |
|
Sikander Saleem
|
970887b0c5
|
changes
|
3 years ago |
Elham Rababh
|
9777b3f2ab
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into foote_in_all_pages
|
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 |
|
haroon amjad
|
5f521556dc
|
Dental flow fixes
|
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 |
|
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
|
13737548bb
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into foote_in_all_pages
|
3 years ago |
|
Elham Rababh
|
ab2fc6aa2c
|
fix issues related to footer
|
3 years ago |
|
Sikander Saleem
|
350ff20a1a
|
my doctor screen.
|
3 years ago |
|
haroon amjad
|
0121337d1b
|
LiveCare Flow from book appointment flow implemented
|
3 years ago |
|
Elham Rababh
|
f85c359cf4
|
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 |
|
haroon amjad
|
eadba3f767
|
Working on livecare appointment booking page
|
3 years ago |
|
Elham Rababh
|
8626b4f269
|
first step from add footer for all pages
|
3 years ago |
haroon amjad
|
5c8e9f4e19
|
Merge branch 'Haroon' into 'development'
Haroon
See merge request Cloud_Solution/diplomatic-quarter!352
|
3 years ago |
Zohaib Iqbal Kambrani
|
f442cc251c
|
Pre Post Images Dental Doctor Profile
|
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
|
47e521fe1d
|
Merge branch 'development' into Haroon
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/pages/feedback/send_feedback_page.dart
# lib/pages/landing/home_page.dart
# lib/uitl/translations_delegate_base.dart
# lib/widgets/in_app_browser/InAppBrowser.dart
|
3 years ago |
|
Mirza.Shafique
|
b31813770e
|
Check-In NFC done
|
3 years ago |
|
haroon amjad
|
6b675acc94
|
Merge branch 'development' into Haroon
# Conflicts:
# lib/pages/feedback/send_feedback_page.dart
|
4 years ago |
|
Sultan Khan
|
b891c1bd80
|
theme issue
|
4 years ago |
|
haroon amjad
|
da3ad90ddd
|
added app-wide route transition animation
|
4 years ago |
|
haroon amjad
|
deb0b40cfe
|
fixes
|
4 years ago |
|
Mohammad Aljammal
|
29f4e6acb6
|
Merge branch 'hmg-services-fixing' into 'development'
Hmg services fixing
See merge request Cloud_Solution/diplomatic-quarter!262
|
4 years ago |
|
haroon amjad
|
9ecf745747
|
fixes
|
4 years ago |
|
haroon amjad
|
b6c617888b
|
Merge branch 'development' into Haroon
# Conflicts:
# lib/config/localized_values.dart
|
4 years ago |
mosazaid
|
0444b21101
|
Merge branch 'development' into hmg-services-fixing
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
|
4 years ago |
|
mosazaid
|
822defbd04
|
working on bmi calculator design and functionality
|
4 years ago |
|
haroon amjad
|
7c538b350f
|
LiveCare Scheduling finalized, Appointments in ToDo list categorized
|
4 years ago |
|
haroon amjad
|
dde10cd27b
|
working in LiveCare Scheduling
|
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 |
|
Haroon Amjad
|
b0ea1fc262
|
updates & fixes
|
4 years ago |
|
haroon amjad
|
8c9762c24f
|
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
|
051bd1e23f
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
|
4 years ago |
|
haroon amjad
|
951d9b553f
|
fixes & updates
|
4 years ago |
|
haroon amjad
|
740a294867
|
Translation & bug fixes
|
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
|
7edb0c8009
|
Doctor rating dialog revamped
|
4 years ago |
Zohaib Kambrani
|
27182ee8db
|
no message
|
4 years ago |
|
haroon amjad
|
e5feef8a9d
|
Updates & UI Fixes
|
4 years ago |
|
haroon amjad
|
d284ceac04
|
advance payment & payment flow issues fixed
|
4 years ago |
|
Sultan Khan
|
fdef34a394
|
viral sign issue
|
4 years ago |
|
Sultan Khan
|
3589b21590
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
haroon amjad
|
b89c1f03b3
|
language translation fixes
|
4 years ago |
|
Sultan Khan
|
f05b235cd0
|
login issue
|
4 years ago |
|
haroon amjad
|
2e484d7535
|
QR Code loading issue resolved
|
4 years ago |
|
haroon amjad
|
10efccbce8
|
my appointment fixes
|
4 years ago |
|
haroon amjad
|
506e32e8c8
|
Payment issues resolved
|
4 years ago |
|
haroon amjad
|
b7b7ead3ba
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
|
4 years ago |
|
haroon amjad
|
f0897881d1
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
|
4 years ago |
|
haroon amjad
|
d75e5caf08
|
fixed appointment online checkIn issue
|
4 years ago |