Sultan Khan
|
671c432cd7
|
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
|
0086875d0d
|
Design Updated for tracker
|
3 years ago |
haroon amjad
|
9ffe064a3b
|
updates & fixes
|
3 years ago |
|
Sultan Khan
|
d2d22ff1fc
|
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
|
73ff5c4707
|
Bug fixes
|
3 years ago |
 Sikander Saleem
|
d9c1b8b8ea
|
Merge branch 'development' into development_new_design_2.0
# Conflicts:
# lib/config/localized_values.dart
# lib/main.dart
# lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
# lib/pages/landing/landing_page.dart
# lib/pages/medical/ask_doctor/ask_doctor_home_page.dart
# lib/pages/medical/eye/EyeMeasurementsPage.dart
# lib/uitl/translations_delegate_base.dart
# lib/uitl/utils.dart
|
3 years ago |
|
haroon amjad
|
4469ae1209
|
updates & fixes
|
3 years ago |
|
Sikander Saleem
|
fab051f9e7
|
Merge branch 'development' into development_new_design_2.0
# Conflicts:
# lib/uitl/translations_delegate_base.dart
# lib/widgets/others/app_scaffold_widget.dart
|
3 years ago |
|
Sultan Khan
|
c6e7c8cd37
|
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
|
52665fe217
|
login issue fixed
|
3 years ago |
Mohammad Aljammal
|
55f9bbcba4
|
Merge branch 'fatima-new' into 'development'
Fatima new
See merge request Cloud_Solution/diplomatic-quarter!379
|
3 years ago |
|
Sikander Saleem
|
a61fea551c
|
Merge branch 'development' into development_new_design_2.0
# Conflicts:
# lib/config/localized_values.dart
# lib/pages/ErService/AmbulanceRequestIndexPages/Summary.dart
# lib/uitl/translations_delegate_base.dart
|
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
|
b83318faf8
|
Merge branch 'Haroon' into 'development'
Haroon
See merge request Cloud_Solution/diplomatic-quarter!382
|
3 years ago |
|
haroon amjad
|
faff3b90cb
|
Merge branch 'development' into Haroon
# Conflicts:
# lib/core/service/er/am_service.dart
|
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 |
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 |
|
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 |
|
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
|
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 |
|
Mohammad Aljammal
|
36142f0f6d
|
Merge branch 'fix_bug_pharmacy' into 'development'
fix bugs pharmacy
See merge request Cloud_Solution/diplomatic-quarter!375
|
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 |
|
Sultan Khan
|
b116079843
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
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 |
|
haroon amjad
|
72dbdd2c2b
|
Merge branch 'development' into Haroon
|
3 years ago |
|
haroon amjad
|
e96157c74a
|
Covid certificate passport CR implemented
|
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 |
|
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
|
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 |
|
haroon amjad
|
5f521556dc
|
Dental flow fixes
|
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 |
|
Sikander Saleem
|
5ab9dd1761
|
Appointment screen Changes & improvements.
|
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 |
|
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 |
|
haroon amjad
|
0121337d1b
|
LiveCare Flow from book appointment flow implemented
|
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 |
|
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 |
|
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 |
|
Fatimah Alshammari
|
74d0826342
|
fixed issues
|
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 |
|
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 |
|
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 |
Elham Rababh
|
1568698b98
|
fix issues related to wight and sugar blood
|
3 years ago |
|
Sikander Saleem
|
bb20d65b40
|
lab result detail screen.
|
3 years ago |
hussam al-habibeh
|
8f5fef87e9
|
add blood pressure translation issue
|
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 |
|
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 |
|
Zohaib Iqbal Kambrani
|
c215b22cf7
|
Merge branch 'development' into ZohaibIqbalKambrani
* development:
fixes
registration
|
3 years ago |
|
Zohaib Iqbal Kambrani
|
f442cc251c
|
Pre Post Images Dental Doctor Profile
|
3 years ago |
|
Sikander Saleem
|
d1b45c8bcc
|
Merge branch 'login_design_sikander' into development_new_design_2.0
|
3 years ago |
|
Mirza.Shafique
|
85c759a4a5
|
Merge branch 'mirza_home_page' into development_new_design_2.0
|
3 years ago |
|
Sikander Saleem
|
5b778f0493
|
appointment ui (cont.) & improvement.
|
3 years ago |
|
Sultan Khan
|
1586f02542
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
3 years ago |
|
Sultan Khan
|
6b7eaaafb9
|
fixes
|
3 years ago |
|
Mirza.Shafique
|
5f44dece71
|
Ganaric Font and font implementaion
|
3 years ago |
|
haroon amjad
|
a32501f3dc
|
My invoices implementation continued
|
3 years ago |
|
Sikander Saleem
|
ff55ae1908
|
improvements
|
3 years ago |
|
Sikander Saleem
|
bb3d11ccf8
|
remove spaces.
|
3 years ago |
|
Sikander Saleem
|
bb9d1bfcd5
|
improvements
|
3 years ago |
|
Sikander Saleem
|
80c50e29bf
|
Merge branch 'login_design_sikander' into development_new_design_2.0
# Conflicts:
# lib/config/config.dart
# lib/pages/landing/landing_page.dart
|
3 years ago |
|
Sikander Saleem
|
4db432b351
|
lab results working(cont.) & improvements
|
3 years ago |
|
Mirza.Shafique
|
38465eaafb
|
Home page icons and drawer
|
3 years ago |
|
Zohaib Iqbal Kambrani
|
429fcb1e60
|
Merge branch 'development' into ZohaibIqbalKambrani
* development: (32 commits)
changes
package name changed
Jira Fixes
Jira fixes
PAP-664
PAP-664
PAP-664
langauge issue
bug fix
PAP-777
PAP-729
fix button
fix translate issues
CONFIG
PAP-715 : Y –axis and X –axis values should be display in the yearly graph details.
bug fixes
fix bugs
fixing dashboard issue
fixing dashboard issue
jira bugs
...
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/core/service/client/base_app_client.dart
# lib/uitl/translations_delegate_base.dart
# lib/uitl/utils.dart
|
3 years ago |
|
hussam al-habibeh
|
d3868844de
|
Medication availability
|
3 years ago |
|
Mirza.Shafique
|
1bea9d39b5
|
Merge branch 'mirza_home_page' into development_new_design_2.0
|
3 years ago |
|
Mirza.Shafique
|
06f877b8d4
|
Home page new design & drawer
|
3 years ago |
|
Zohaib Iqbal Kambrani
|
bf303a7be0
|
RRT Implementation
|
3 years ago |
|
Sultan Khan
|
97d7f9225e
|
package name changed
|
3 years ago |
|
haroon amjad
|
709877b5f1
|
Merge branch 'development' into Haroon
# Conflicts:
# lib/pages/login/forgot-password.dart
# lib/pages/medical/radiology/radiology_details_page.dart
|
3 years ago |
|
haroon amjad
|
90db04cee1
|
Jira Fixes
|
3 years ago |
|
Sikander Saleem
|
2d64426cd4
|
Merge branch 'login_design_sikander' into development_new_design_2.0
|
3 years ago |
|
Sikander Saleem
|
70614d3555
|
merge improvements-1.
|
3 years ago |
|
Mirza.Shafique
|
99c6318410
|
Merge branch 'mirza_home_page' into development_new_design_2.0
|
3 years ago |
|
Mirza.Shafique
|
2d62822536
|
Medical Profile Page improvements
|
3 years ago |