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 |
Mohammad Aljmma
|
4a4d5248a2
|
fix status issue
|
4 years ago |
Elham Rababah
|
64f970c40c
|
Fix issues after the merge
|
4 years ago |
|
haroon amjad
|
5020c24e8b
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
# Conflicts:
# lib/pages/landing/landing_page.dart
# lib/pages/login/confirm-login.dart
# lib/services/authentication/auth_provider.dart
|
4 years ago |
|
haroon amjad
|
15a8e64e7c
|
updates & fixes
|
4 years ago |
|
Sultan Khan
|
d939b2ec9b
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
Sultan Khan
|
f8e05fc447
|
regiter issue
|
4 years ago |
|
haroon amjad
|
4f53d058d4
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
|
4 years ago |
|
haroon amjad
|
aeab57beab
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
# Conflicts:
# lib/main.dart
# lib/pages/landing/home_page.dart
|
4 years ago |
|
haroon amjad
|
f5a2870fac
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
Implemented Badge count on ToDo list & my appointments
|
4 years ago |
|
Mohammad Aljmma
|
479aea4df8
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into home_page
Conflicts:
lib/uitl/translations_delegate_base.dart
|
4 years ago |
|
Mohammad Aljmma
|
e10a0a4d54
|
add splash page fix language issues
|
4 years ago |
|
haroon amjad
|
1553e71e7d
|
New loading dialog added into appointment flow
|
4 years ago |
|
haroon amjad
|
6fd7a3fa3d
|
updates
|
4 years ago |
|
Mohammad Aljmma
|
0b90d3c687
|
fix issues
|
4 years ago |
|
haroon amjad
|
d5118bda11
|
Login / Register UI fixes
|
4 years ago |
|
haroon amjad
|
3354058738
|
Branding updated according to DQ
|
4 years ago |
|
haroon amjad
|
6a630f6d33
|
logo & colors changed for login & registration flow
|
4 years ago |
|
Mohammad Aljmma
|
26cf849f2b
|
hot fixing
|
4 years ago |
|
haroon amjad
|
dfa7e0e02f
|
updates & fixes
|
4 years ago |
|
haroon amjad
|
0b6cd845f1
|
implementing Smart Watch Integration
|
4 years ago |
|
jammal
|
0fceca8f3e
|
fix ios issues
|
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
|
3ad928902b
|
voice command
|
4 years ago |
|
haroon amjad
|
41d50e23e3
|
covid drivethru implemented
|
4 years ago |
|
Mohammad Aljammal
|
84bb68789d
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into haroon_s
Conflicts:
lib/config/config.dart
lib/pages/BookAppointment/widgets/DoctorView.dart
lib/pages/ContactUs/LiveChat/hospitalsLivechat_page.dart
lib/pages/ContactUs/findus/hospitrals_page.dart
lib/pages/ContactUs/findus/pharmacies_page.dart
|
4 years ago |
|
Sultan Khan
|
ea86e88e2e
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
Sultan Khan
|
5c859034d6
|
voice search
|
4 years ago |
|
haroon amjad
|
929e289a6f
|
started implementing Covid-19 DriveThru Test Module
|
4 years ago |
|
haroon amjad
|
7fdc0da9dc
|
livecare scheduling implemented
|
4 years ago |
|
Mohammad Aljammal
|
3946f0355c
|
Merge branches 'master' and 'my_trackers' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into my_trackers
Conflicts:
lib/config/localized_values.dart
lib/core/service/client/base_app_client.dart
lib/locator.dart
lib/pages/landing/landing_page.dart
|
4 years ago |
|
haroon amjad
|
c9256a654a
|
LiveCare Scheduling updates
|
4 years ago |
|
Mohammad Aljammal
|
82c2577d36
|
Done ask doctor service
|
4 years ago |
|
Sultan Khan
|
a535543863
|
more pages added on the voice search
|
4 years ago |
|
haroon amjad
|
0628aef62a
|
applied dental change in SearchByClinic
|
4 years ago |
|
Sultan Khan
|
a98bc226e6
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
Sultan Khan
|
0f63b922d1
|
speech to text
|
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 |
|
Sultan Khan
|
f6a3f0e615
|
family file
|
4 years ago |
|
haroon amjad
|
ce9903fd13
|
nearest appointment flow implemented
|
4 years ago |
|
haroon amjad
|
51078227ab
|
Dental appointment flow implemented
|
4 years ago |
|
Sultan Khan
|
826c50ebf1
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
haroon amjad
|
1886f3a763
|
implementing Dental Appointment flow
|
4 years ago |
|
Sultan Khan
|
6b2f1a86df
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
Sultan Khan
|
3a4c016f4e
|
search
|
4 years ago |
|
Mohammad Aljammal
|
ef4a57223c
|
fix DoctorView.dart UI issues
|
4 years ago |
|
haroon amjad
|
a7f5dfab5c
|
fixes
|
4 years ago |
|
haroon amjad
|
35cd02494c
|
implemented search by doctor list
|
4 years ago |
|
haroon amjad
|
e29c6a892e
|
updates
|
4 years ago |
|
haroon amjad
|
f669adcb9d
|
Location service implemented
|
4 years ago |
|
haroon amjad
|
84e92cb040
|
updates & fixes
|
4 years ago |
|
haroon amjad
|
96b7d00b4b
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
|
4 years ago |
|
haroon amjad
|
823eda0d5c
|
updates
|
4 years ago |
|
Sultan Khan
|
130fb53a65
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
Mohammad Aljammal
|
c0c6376f55
|
filter doctor by department
|
4 years ago |
|
Mohammad Aljammal
|
dc9b9e21ad
|
filter doctor by department
|
4 years ago |
|
Sultan Khan
|
1974e51602
|
merge
|
4 years ago |
|
Sultan Khan
|
5d112b5464
|
merge
|
4 years ago |
|
Sultan Khan
|
8516f7de1b
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
Sultan Khan
|
9b55309d53
|
text to speech
|
4 years ago |
|
haroon amjad
|
732ab90b2f
|
Book Appointment check login
|
4 years ago |
|
Sultan Khan
|
327c4585a6
|
family file change
|
4 years ago |
|
haroon amjad
|
db30fbdfd2
|
implementing livecare
|
4 years ago |
|
Sultan Khan
|
47c42808fd
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
Sultan Khan
|
913729fc58
|
speech search
|
4 years ago |
|
haroon amjad
|
b9d913e6a5
|
Merge fixes & 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
|
192a3835d6
|
implemented payment method selection & payment details dialog. Added Calendar events to add remindar in calendar for appointment.
|
4 years ago |
|
haroon amjad
|
06f95c5379
|
Appointment Details implementation continued
|
4 years ago |
|
haroon amjad
|
0171664779
|
Master Merged in to local
|
4 years ago |
|
haroon amjad
|
049d455e3c
|
Implementing appointment details functions
|
4 years ago |
|
haroon amjad
|
d8fe501341
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
# lib/config/config.dart
# lib/pages/BookAppointment/BookingOptions.dart
# lib/services/appointment_services/GetDoctorsList.dart
# lib/uitl/translations_delegate_base.dart
# lib/widgets/others/app_scaffold_widget.dart
|
4 years ago |
|
haroon amjad
|
e34da6485b
|
Doctor Free Slots implemented
|
4 years ago |
|
Mohammad Aljammal
|
b2875fbce3
|
merge haroun
|
4 years ago |
|
haroon amjad
|
ca7b4534a8
|
Search By Clinic & Search By Doctor Name 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 |
|
haroon amjad
|
9842c3a0b1
|
Translation updates
|
4 years ago |
|
haroon amjad
|
1554a6bdf5
|
Book Appointment Flow added
|
4 years ago |