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
|
b83318faf8
|
Merge branch 'Haroon' into 'development'
Haroon
See merge request Cloud_Solution/diplomatic-quarter!382
|
3 years ago |
|
haroon amjad
|
f8c295defe
|
Merge branch 'ZohaibIqbalKambrani' into 'development'
Zohaib iqbal kambrani
See merge request Cloud_Solution/diplomatic-quarter!381
|
3 years ago |
haroon amjad
|
8cb9a5e619
|
updates
|
3 years ago |
|
haroon amjad
|
faff3b90cb
|
Merge branch 'development' into Haroon
# Conflicts:
# lib/core/service/er/am_service.dart
|
3 years ago |
|
haroon amjad
|
e9ec2e2faf
|
Ambulance request APIs revamped
|
3 years ago |
Zohaib Iqbal Kambrani
|
d9672c47a0
|
Merge branch 'development' into ZohaibIqbalKambrani
* development:
BUG FIXES
fix issues PAP-910,PAP-911
fix bugs pharmacy
Dental procedures implemented
Revert "Merge branch 'foote_in_all_pages' into 'development'"
fixed products issues
calendar events changes
Covid passport CR implemented in Covid test flow
doctor schedule
Covid certificate passport CR implemented
Covid Lab result generate certificate implemented
return bottom sheet inside appointments list
fix issues related to footer
remove unused code
remove footer from pharmacy pages
first step from add footer for all pages
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
|
3 years ago |
Sultan Khan
|
abcd207554
|
schedule page fix
|
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 |
Fatimah Alshammari
|
f09cdd944d
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new
# Conflicts:
# lib/uitl/translations_delegate_base.dart
|
3 years ago |
|
Fatimah Alshammari
|
827d8733a1
|
fixed shopping cart issue
|
3 years ago |
 Sikander Saleem
|
402cf5936a
|
improvement.
|
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 |
|
Sikander Saleem
|
bf920d4188
|
find us redesigned.
|
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 |
|
Zohaib Iqbal Kambrani
|
d1c99d1d82
|
ER Average waiting time label applied
|
3 years ago |
|
haroon amjad
|
4c2b70fcb5
|
Merge branch 'development' into Haroon
|
3 years ago |
|
haroon amjad
|
21c3686e05
|
Ambulance request services revamping
|
3 years ago |
|
Sikander Saleem
|
363cf78884
|
improvement.
|
3 years ago |
|
Sikander Saleem
|
b78f8f76db
|
improvement.
|
3 years ago |
|
Sikander Saleem
|
1c020134e8
|
Merge branch 'new_design_sikander' into development_new_design_2.0
|
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 |
Elham Rababh
|
2e2f7334d5
|
fix issues PAP-910,PAP-911
|
3 years ago |
|
Sikander Saleem
|
cfa3ca62b6
|
prescription tab bar improvement.
|
3 years ago |
|
Sikander Saleem
|
3cc18cfb24
|
medical reports ui redesigned.
|
3 years ago |
|
Sikander Saleem
|
9fdebc2db7
|
ask doctor ui redesigned
|
3 years ago |
|
Fatimah Alshammari
|
b6981299d9
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new
|
3 years ago |
|
Fatimah Alshammari
|
239ad530ce
|
fixed isuues
|
3 years ago |
Mohammad Aljammal
|
36142f0f6d
|
Merge branch 'fix_bug_pharmacy' into 'development'
fix bugs pharmacy
See merge request Cloud_Solution/diplomatic-quarter!375
|
3 years ago |
|
Mohammad Aljammal
|
8abbb04f02
|
Merge branch 'fatima-new' into 'development'
Fatima new
See merge request Cloud_Solution/diplomatic-quarter!373
|
3 years ago |
mosazaid
|
a2e60e7584
|
fix bugs pharmacy
|
3 years ago |
|
haroon amjad
|
e9c26ee85f
|
Dental procedures implemented
|
3 years ago |
|
Sikander Saleem
|
ca363adee2
|
merge & improvements
|
3 years ago |
|
Sikander Saleem
|
6191377914
|
Merge branch 'development' into development_new_design_2.0
# Conflicts:
# lib/pages/login/login.dart
# lib/uitl/translations_delegate_base.dart
# lib/widgets/data_display/medical/LabResult/LabResultWidget.dart
# lib/widgets/data_display/medical/LabResult/laboratory_result_widget.dart
|
3 years ago |
|
Mohammad Aljammal
|
8b3a0b3ada
|
Revert "Merge branch 'foote_in_all_pages' into 'development'"
This reverts merge request !369
|
3 years ago |
|
Fatimah Alshammari
|
72ba0c7c74
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new
|
3 years ago |
|
Fatimah Alshammari
|
f3b545ff74
|
fixed products issues
|
3 years ago |
|
Sikander Saleem
|
9e75a45cd5
|
improvement.
|
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 |
|
Sikander Saleem
|
d605084a91
|
appointment list and detail ui changed
|
3 years ago |
|
Sultan Khan
|
b116079843
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
3 years ago |
|
Sultan Khan
|
1a501a3b2a
|
calendar events changes
|
3 years ago |
|
Mirza.Shafique
|
ad025f3d8e
|
Booking appointment 1.2
|
3 years ago |
|
haroon amjad
|
0d1d68273b
|
Covid passport CR implemented in Covid test flow
|
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
|
ba0c0beef6
|
Merge branch 'development_new_design_2.0' into mirza_home_page
|
3 years ago |
|
Mirza.Shafique
|
d2b2b4063d
|
Booking appointment 1.1
|
3 years ago |
|
haroon amjad
|
72dbdd2c2b
|
Merge branch 'development' into Haroon
|
3 years ago |
|
haroon amjad
|
e96157c74a
|
Covid certificate passport CR implemented
|
3 years ago |
|
Mohammad Aljammal
|
68491631f3
|
Merge branch 'foote_in_all_pages' into 'development'
Foote in all pages
See merge request Cloud_Solution/diplomatic-quarter!369
|
3 years ago |
|
Zohaib Iqbal Kambrani
|
d33432d238
|
Covid Drive-Thru Questions Screen
|
3 years ago |
|
haroon amjad
|
73097d15de
|
Covid Lab result generate certificate implemented
|
3 years ago |
|
haroon amjad
|
d83a611d95
|
FCM Permission fix
|
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
|
2ba91e54ab
|
merge-changes
|
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
|
acd3855c77
|
Merge branch 'development' into development_new_design_2.0
|
3 years ago |
|
Sikander Saleem
|
71f888ea9b
|
improvements
|
3 years ago |
|
Sikander Saleem
|
288d64214e
|
improvements
|
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 |
|
haroon amjad
|
3235f489b9
|
Merge branch 'development' into Haroon
|
3 years ago |
|
Sikander Saleem
|
51c398e84a
|
Merge branch 'new_design_sikander' into development_new_design_2.0
|
3 years ago |
|
Sikander Saleem
|
e9db30d3da
|
otp clear when wrong code entered.
|
3 years ago |
|
haroon amjad
|
5009e48f64
|
Updates in Ambulance Request & Covid test
|
3 years ago |
|
Sultan Khan
|
301728ed3d
|
family file fix
|
3 years ago |
|
Mirza.Shafique
|
ca3495d71c
|
Merge branch 'mirza_home_page' into development_new_design_2.0
|
3 years ago |
|
Mirza.Shafique
|
0a83cf8241
|
Bug Fixis
|
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 |
|
Mirza.Shafique
|
374a14eac4
|
Merge branch 'development_new_design_2.0' into mirza_home_page
|
3 years ago |
|
Mirza.Shafique
|
2a4e0a604a
|
Medical Perscription 1.1
|
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
|
13737548bb
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into foote_in_all_pages
|
3 years ago |
|
haroon amjad
|
cbbca5ce86
|
Merge branch 'development' into Haroon
|
3 years ago |
|
Sikander Saleem
|
458dc2474b
|
Merge branch 'development' into development_new_design_2.0
# Conflicts:
# lib/uitl/translations_delegate_base.dart
|
3 years ago |
|
Sikander Saleem
|
047941fffc
|
Merge branch 'new_design_sikander' into development_new_design_2.0
|
3 years ago |
|
Sikander Saleem
|
5647ab75e5
|
improvements.
|
3 years ago |
|
Mirza.Shafique
|
b2bba050e8
|
Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0
# Conflicts:
# lib/widgets/new_design/doctor_header.dart
|
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 |
|
Mirza.Shafique
|
8c8a9c7ce2
|
Medical Perscription 1.0
|
3 years ago |
|
Sikander Saleem
|
350ff20a1a
|
my doctor screen.
|
3 years ago |
|
Mohammad Aljammal
|
b98a84bcac
|
Merge branch 'fatima-new' into 'development'
Fatima new
See merge request Cloud_Solution/diplomatic-quarter!361
|
3 years ago |
|
Mohammad Aljammal
|
41f1704790
|
Merge branch 'blood_pressure' into 'development'
Blood pressure
See merge request Cloud_Solution/diplomatic-quarter!362
|
3 years ago |
|
Sikander Saleem
|
ec6693c55e
|
improvement.
|
3 years ago |
|
haroon amjad
|
0121337d1b
|
LiveCare Flow from book appointment flow implemented
|
3 years ago |
|
Mirza.Shafique
|
24b7a8a4c4
|
Merge branch 'mirza_home_page' into development_new_design_2.0
|
3 years ago |
|
Sikander Saleem
|
6c8f1c6185
|
merge improvement.
|
3 years ago |
|
Mirza.Shafique
|
cbadcd5feb
|
Vital Sings Detail Page 1.0
|
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 |
|
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 |
|
Elham Rababh
|
d028ce22dc
|
remove unused code
|
3 years ago |
|
hussam al-habibeh
|
fe83b91602
|
body fat texfield fix
|
3 years ago |
|
Elham Rababh
|
69df61afb1
|
remove footer from pharmacy pages
|
3 years ago |
|
Mirza.Shafique
|
e91cf4762a
|
Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0
|
3 years ago |
|
Mirza.Shafique
|
d865e97ce1
|
Vital Sings Home Page
|
3 years ago |
|
Sikander Saleem
|
b3fd1cb93d
|
lab result detail flow chart screen & improvement.
|
3 years ago |
|
hussam al-habibeh
|
864f849425
|
Baby age in ovulation period
|
3 years ago |
|
Fatimah Alshammari
|
787b55a803
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new
# Conflicts:
# lib/pages/medical/my_trackers/blood_pressure/AddBloodPressurePage.dart
# lib/uitl/translations_delegate_base.dart
|
3 years ago |
|
Fatimah Alshammari
|
34ccb132dc
|
fixed issues
|
3 years ago |
Mohammad Aljammal
|
d9fabbab17
|
Fix feedback
|
3 years ago |
|
Fatimah Alshammari
|
74d0826342
|
fixed issues
|
3 years ago |
Sultan khan
|
04a68c5bd3
|
Merge branch 'sultan-patientapp' into 'development'
Sultan patientapp
See merge request Cloud_Solution/diplomatic-quarter!358
|
3 years ago |
|
Sultan khan
|
b8d75b5604
|
Merge branch 'blood_pressure' into 'development'
add blood pressure translation issue
See merge request Cloud_Solution/diplomatic-quarter!356
|
3 years ago |
|
Sultan khan
|
6a0acd8afb
|
Merge branch 'fix-bugs' into 'development'
Fix bugs
See merge request Cloud_Solution/diplomatic-quarter!355
|
3 years ago |
|
Sultan Khan
|
5b656b0b51
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
3 years ago |
|
Sultan Khan
|
9610ff640e
|
feedback changes
|
3 years ago |
|
haroon amjad
|
cbbef80bd5
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
|
3 years ago |
|
haroon amjad
|
eadba3f767
|
Working on livecare appointment booking page
|
3 years ago |
|
hussam al-habibeh
|
b9d4195e20
|
Blood pressure translation issue
|
3 years ago |
|
hussam al-habibeh
|
9c6f83600b
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into blood_pressure
Conflicts:
lib/pages/medical/my_trackers/blood_pressure/AddBloodPressurePage.dart
|
3 years ago |
|
mosazaid
|
3077624c58
|
fix bugs
|
3 years ago |
|
Sultan khan
|
3c2a89cd8e
|
Merge branch 'Aug_fixes' into 'development'
fix issues related to wight and sugar blood
See merge request Cloud_Solution/diplomatic-quarter!354
|
3 years ago |
|
Sultan khan
|
cd56881d7a
|
Merge branch 'pharmacy-bugs' into 'development'
hide Covid19-driveThrow for patient out of KSA
See merge request Cloud_Solution/diplomatic-quarter!353
|
3 years ago |
|
Sultan khan
|
8eb67791ca
|
Merge branch 'fatima-new' into 'development'
Fatima new
See merge request Cloud_Solution/diplomatic-quarter!349
|
3 years ago |
|
Elham Rababh
|
8629b62fcb
|
fix issue
|
3 years ago |
|
Elham Rababh
|
1568698b98
|
fix issues related to wight and sugar blood
|
3 years ago |
|
Sikander Saleem
|
6ee56cba0d
|
Merge branch 'login_design_sikander' into development_new_design_2.0
# Conflicts:
# lib/widgets/data_display/medical/doctor_card.dart
# lib/widgets/new_design/doctor_header.dart
|
3 years ago |
|
Sikander Saleem
|
bb20d65b40
|
lab result detail screen.
|
3 years ago |
|
Mirza.Shafique
|
66efbc1bac
|
Radiology Implementation
|
3 years ago |
|
hussam al-habibeh
|
8f5fef87e9
|
add blood pressure translation issue
|
3 years ago |
|
Mirza.Shafique
|
26c30038c9
|
Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0
|
3 years ago |
|
Mirza.Shafique
|
29fd552874
|
Weight, height and blood pressure on Home Page
|
3 years ago |
|
Sikander Saleem
|
35b5d38b82
|
Merge branch 'login_design_sikander' into development_new_design_2.0
|
3 years ago |
|
Sikander Saleem
|
3a1af590ff
|
lab result detail screen (cont.)
|
3 years ago |
|
hussam al-habibeh
|
a33a6b0b2f
|
push request after conflict resolve
|
3 years ago |
|
hussam al-habibeh
|
0a3c44b5e8
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into medication_availability
Conflicts:
lib/config/localized_values.dart
lib/uitl/translations_delegate_base.dart
|
3 years ago |
|
hussam al-habibeh
|
352cda4c70
|
hide Covid19-driveThrow for patient out of KSA
|
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 |
|
haroon amjad
|
2242b78116
|
Merge branch 'development' into Haroon
# Conflicts:
# lib/config/config.dart
|
3 years ago |
|
haroon amjad
|
e28fdaade1
|
Dental Invoices implementation completed
|
3 years ago |