 Sikander Saleem
|
c07a8f54c7
|
merge changes-2
|
3 years ago |
|
Sikander Saleem
|
14561d0ac6
|
merge changes-1
|
3 years ago |
|
Sikander Saleem
|
a5d40f090a
|
improvements-test
|
3 years ago |
Mirza.Shafique
|
49bfa2e9a7
|
Home page 1.3
|
3 years ago |
Sultan Khan
|
ed20ba65b3
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
3 years ago |
|
Sultan Khan
|
23ca95b9b6
|
bug fixes
|
3 years ago |
Mohammad Aljammal
|
9b3a679948
|
Merge branch 'fix-bugs' into 'development'
fix bugs
See merge request Cloud_Solution/diplomatic-quarter!336
|
3 years ago |
mosazaid
|
e9dbc4be7a
|
fix bugs
|
3 years ago |
Zohaib Iqbal Kambrani
|
08e0ce52c8
|
Merge branch 'development' into ZohaibIqbalKambrani
* development:
fix bugs
|
3 years ago |
|
Zohaib Iqbal Kambrani
|
4abdd9bde7
|
no message
|
3 years ago |
|
mosazaid
|
2e33c2b240
|
fix bugs
|
3 years ago |
Sultan khan
|
487d63ec7f
|
Merge branch 'bug_fix_mirza' into 'development'
Check-In NFC
See merge request Cloud_Solution/diplomatic-quarter!326
|
3 years ago |
|
Sikander Saleem
|
eb9005510d
|
bug fixes and insurance approvals improvements.
|
3 years ago |
|
Mirza.Shafique
|
fb0a67e5bd
|
PAP 828 and 792 issue fix
|
3 years ago |
|
Sultan khan
|
15f620d720
|
Merge branch 'Jul_fixes' into 'development'
Jul fixes
See merge request Cloud_Solution/diplomatic-quarter!322
|
3 years ago |
hussam al-habibeh
|
fefde8f575
|
jira bugs
|
3 years ago |
|
hussam al-habibeh
|
446021eb90
|
adding doctor list to health calculator
|
3 years ago |
|
hussam al-habibeh
|
854352d9ce
|
jira bugs
|
3 years ago |
|
Sikander Saleem
|
d0c8c4f017
|
Bug PAP-671, PAP-672 fixed, bottom nav added on H2O screen.
|
3 years ago |
Elham Rababh
|
dd1dff01d6
|
PAP-790: fix Alignment of mobile number
|
3 years ago |
|
Sikander Saleem
|
b7fbee3252
|
improvements
|
3 years ago |
|
Sikander Saleem
|
d6566d4abf
|
PAP-678 fixed, month & days in axis are aligned now.
|
3 years ago |
|
Sikander Saleem
|
1f01f40ad8
|
PAP-681 fixed, H2O Unit changing & reflection.
|
3 years ago |
|
Mohammad Aljammal
|
234e69c02d
|
Merge branch 'pharmacy-bugs' into 'development'
Pharmacy bugs
See merge request Cloud_Solution/diplomatic-quarter!315
|
4 years ago |
|
hussam al-habibeh
|
bb6e7e931b
|
pharmacy-bugs
|
4 years ago |
|
Elham Rababah
|
2a47564c37
|
PAP-607: fix issue
|
4 years ago |
|
hussam al-habibeh
|
14939d3513
|
jira bugs (Health Calculator)
|
4 years ago |
|
Elham Rababah
|
aab33b3e03
|
PAP-609: fix text align
|
4 years ago |
|
Mohammad Aljammal
|
e04421079e
|
Merge branch 'fix_bugs_Mar' into 'development'
Fix bugs mar
See merge request Cloud_Solution/diplomatic-quarter!301
|
4 years ago |
|
Elham Rababah
|
6e7f62ca21
|
PAP-612: show ok and cancel options
|
4 years ago |
|
Sultan Khan
|
d4c3b03a5f
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
4 years ago |
|
Sultan Khan
|
1b770420be
|
bug fixes
|
4 years ago |
Mohammad Aljammal
|
7c1fd8043b
|
fix chart and eye and balance
|
4 years ago |
|
Sultan Khan
|
0445011e53
|
bug fixes
|
4 years ago |
haroon amjad
|
454957ebba
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
|
4 years ago |
|
Sultan Khan
|
66acce3b40
|
ancillary order pages added
|
4 years ago |
|
haroon amjad
|
e0ebb922ed
|
pharmacy fixes
|
4 years ago |
|
Sultan Khan
|
b891c1bd80
|
theme issue
|
4 years ago |
|
Sultan Khan
|
1a35fe37b6
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
4 years ago |
|
haroon amjad
|
da3ad90ddd
|
added app-wide route transition animation
|
4 years ago |
|
Mohammad Aljammal
|
8899bdf460
|
Done Prescription Delivery Address
|
4 years ago |
|
Sultan Khan
|
144ef52c70
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
4 years ago |
|
Mohammad Aljammal
|
87ad027d33
|
Merge branch 'improve_hhc' into 'development'
Improve hhc
See merge request Cloud_Solution/diplomatic-quarter!264
|
4 years ago |
|
mosazaid
|
cbe422cbc6
|
Merge branch 'hmg-services-fixing' into development
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/core/service/client/base_app_client.dart
# lib/uitl/translations_delegate_base.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 |
|
Elham Rababah
|
94ee969406
|
hhc msg translation
|
4 years ago |
|
Elham Rababah
|
8a1924cca2
|
fix images in hhc
|
4 years ago |
|
Sultan Khan
|
d33918c932
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
4 years ago |
|
Sikander Saleem
|
e40ad85d61
|
H2O feature, setting page added
|
4 years ago |
|
Sikander Saleem
|
bd062150c1
|
H2O feature improvement
|
4 years ago |
|
Sikander Saleem
|
aef4c7bfac
|
H2O feature improvement
|
4 years ago |
|
Sikander Saleem
|
3b4e791017
|
H2O feature improvement
|
4 years ago |
|
mosazaid
|
822defbd04
|
working on bmi calculator design and functionality
|
4 years ago |
|
Sultan Khan
|
3ac69692be
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
4 years ago |
|
hussam al-habibeh
|
1ce0ef7b6c
|
health-converter fix
|
4 years ago |
|
Sultan Khan
|
ccd2fc5068
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
4 years ago |
|
Sultan Khan
|
c65983bfdb
|
code merged
|
4 years ago |
|
mosazaid
|
3a45239059
|
Merge branch 'development' into fix_design
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
|
4 years ago |
|
mosazaid
|
f5d478fd27
|
re-design child vaccine and fix some funcrionalities
|
4 years ago |
|
Elham Rababah
|
4ecce79258
|
first step from fix CMC
|
4 years ago |
|
Elham Rababah
|
c9edb37a3c
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_hhc_cmc
Conflicts:
lib/config/localized_values.dart
lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/cmc_page.dart
lib/uitl/translations_delegate_base.dart
|
4 years ago |
|
Elham Rababah
|
d7a046f9ca
|
fix issue on cmc
|
4 years ago |
|
Mohammad Aljammal
|
b63025a9b3
|
return CMC HHC
|
4 years ago |
|
Mohammad Aljammal
|
634c874eee
|
fix design issues
|
4 years ago |
|
Mohammad Aljammal
|
298b4d6525
|
change color
|
4 years ago |
|
Mohammad Aljammal
|
952e106531
|
return privilege
|
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
|
591d56e624
|
change the info images and change the out patient color
|
4 years ago |
|
Mohammad Aljammal
|
9c12e949e8
|
hot fixes
|
4 years ago |
|
Sultan Khan
|
040c8f38ab
|
hot fixes
|
4 years ago |
|
Mohammad Aljammal
|
a57d5eb69f
|
hot fixes
|
4 years ago |
|
haroon amjad
|
951d9b553f
|
fixes & updates
|
4 years ago |
|
haroon amjad
|
9d046fd971
|
updates & fixes
|
4 years ago |
|
Sultan Khan
|
ce7a64e86e
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
4 years ago |
|
Mohammad Aljammal
|
9dfd8a71dc
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into privileges
Conflicts:
lib/locator.dart
lib/pages/DrawerPages/family/my-family.dart
lib/pages/login/confirm-login.dart
lib/pages/medical/medical_profile_page.dart
lib/pages/medical/reports/report_home_page.dart
lib/widgets/bottom_navigation/bottom_nav_bar.dart
lib/widgets/drawer/app_drawer_widget.dart
|
4 years ago |
|
Sultan Khan
|
542335364e
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
4 years ago |
|
Mohammad Aljammal
|
459ba828d9
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter
Conflicts:
lib/config/shared_pref_kay.dart
lib/core/service/client/base_app_client.dart
lib/locator.dart
lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
lib/pages/landing/home_page.dart
lib/pages/medical/vital_sign/vital_sign_item.dart
lib/routes.dart
lib/uitl/translations_delegate_base.dart
lib/widgets/others/app_scaffold_widget.dart
pubspec.yaml
|
4 years ago |
|
Sultan Khan
|
496163a61a
|
voice command updated
|
4 years ago |
|
Mohammad Aljammal
|
4e2c955b09
|
add missing translation
|
4 years ago |
|
Sultan Khan
|
f5b7d35f23
|
bug fixes
|
4 years ago |
|
Sultan Khan
|
8c5746f7b1
|
bug fixes
|
4 years ago |
|
Sultan Khan
|
321d31b3bd
|
voice search page updated
|
4 years ago |
|
Sultan Khan
|
d69b3676a4
|
weather indicator in progress
|
4 years ago |
|
Sultan Khan
|
81c8239412
|
bug fixes
|
4 years ago |
|
Mohammad Aljammal
|
269f682bd5
|
Added info images description
|
4 years ago |
|
Mohammad Aljammal
|
dc898a799d
|
Add Privileges
|
4 years ago |
|
Sultan Khan
|
3ab513d9d0
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
4 years ago |
|
Sultan Khan
|
98f84c2161
|
voice search in progress
|
4 years ago |
Elham Rababah
|
713e44cf8b
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hhc_cmc
Conflicts:
lib/config/localized_values.dart
lib/uitl/translations_delegate_base.dart
|
4 years ago |
|
Elham Rababah
|
ea195ea9bf
|
Finish translate CMC HHC
|
4 years ago |
|
haroon amjad
|
4f1f7dcefd
|
ereferral implementation completed
|
4 years ago |
|
haroon amjad
|
65fbd7af8e
|
referral finalised
|
4 years ago |
|
Elham Rababah
|
5bf63174c9
|
First step from translations
|
4 years ago |
|
haroon amjad
|
82e23efd32
|
working on ereferral
|
4 years ago |
|
Sultan Khan
|
8de838a6dc
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
4 years ago |
|
Sultan Khan
|
2fb0ccfdbd
|
Merge branch 'sultan' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
4 years ago |
|
haroon amjad
|
6846a8501a
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
# lib/config/localized_values.dart
# lib/core/service/client/base_app_client.dart
# lib/uitl/translations_delegate_base.dart
|
4 years ago |
|
haroon amjad
|
0181043da8
|
Ereferral fixes, smartwatch health data integration
|
4 years ago |
|
Elham Rababah
|
1e1677a365
|
naming issue fix
|
4 years ago |
|
Elham Rababah
|
05deaa6322
|
Address Added Successfully
|
4 years ago |
|
Elham Rababah
|
68e4b92717
|
Address Added Successfully
|
4 years ago |
|
Sultan Khan
|
7d3c1ac852
|
weather indicator updated
|
4 years ago |
|
Sultan Khan
|
648d9d245d
|
health weather indicator
|
4 years ago |
Zohaib Kambrani
|
27182ee8db
|
no message
|
4 years ago |
|
Elham Rababah
|
ed56476d81
|
second step from location fixes
|
4 years ago |
|
Sultan Khan
|
e7c862c801
|
health weather indicator
|
4 years ago |
|
Sultan Khan
|
a9cb645833
|
health weather indicator
|
4 years ago |
|
Sultan Khan
|
19d6057f66
|
health weather indicator
|
4 years ago |
|
Elham Rababah
|
7aa7af6de7
|
finish CMC module
|
4 years ago |
|
Elham Rababah
|
fd80afeb5a
|
finish hhc module
|
4 years ago |
|
Elham Rababah
|
3ef22be7da
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hhc_cmc
Conflicts:
lib/config/config.dart
|
4 years ago |
|
Elham Rababah
|
a87855f445
|
Fix issues on hhc module
|
4 years ago |
|
Mohammad Aljammal
|
fa01d132c7
|
merger DQ live and fix some issues on Child Vaccines
|
4 years ago |
|
Sultan Khan
|
24b7bca471
|
no message
|
4 years ago |
|
Zohaib Kambrani
|
69d1e4bb0b
|
no message
|
4 years ago |
Mohammad Aljmma
|
e42ebfbf64
|
fix issue #16
|
4 years ago |
|
Mohammad Aljmma
|
59defa4532
|
fix issue #15
|
4 years ago |
|
Elham Rababah
|
9f2beceb22
|
First step from notifications_page
|
4 years ago |
|
Mohammad Aljmma
|
f79d8eb8f9
|
fix login issues
|
4 years ago |
|
Mohammad Aljmma
|
e7e32a414b
|
fix barcode
|
4 years ago |
|
Sultan Khan
|
deb828b4dd
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
Mohammad Aljammal
|
50dffe9af9
|
Merge branch 'Haroon' into 'master'
Haroon
See merge request Cloud_Solution/diplomatic-quarter!74
|
4 years ago |
|
Mohammad Aljmma
|
d0ed776ff6
|
new home health service
|
4 years ago |
|
haroon amjad
|
dfa7e0e02f
|
updates & fixes
|
4 years ago |
|
jammal
|
9328f942ba
|
done ER service
|
4 years ago |
|
jammal
|
7dc55f3378
|
Merge branch 'home_health_care' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into ios_issues
Conflicts:
lib/config/config.dart
lib/config/localized_values.dart
lib/locator.dart
lib/pages/AlHabibMedicalService/E-Referral/e_referral_index_page.dart
lib/pages/AlHabibMedicalService/h2o/h2o_index_page.dart
lib/uitl/translations_delegate_base.dart
|
4 years ago |
|
Sultan Khan
|
f03a711dff
|
symptom checker gender page updated
|
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 |
|
Mohammad Aljammal
|
d3d0fa00e7
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into my_trackers
Conflicts:
lib/pages/landing/home_page.dart
|
4 years ago |
|
Mohammad Aljammal
|
e7cf452a79
|
Merge branch 'insurance' into 'master'
files import fix
See merge request Cloud_Solution/diplomatic-quarter!66
|
4 years ago |
|
Mohammad Aljammal
|
a31796322b
|
fix icons issue
|
4 years ago |
|
Mohammad Aljammal
|
15ac74fadb
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into haroon_s
Conflicts:
lib/pages/AlHabibMedicalService/ health_calculators.dart
|
4 years ago |
|
Mohammad Aljammal
|
53bbafdc2b
|
fix Authenticated User Object
|
4 years ago |
|
hussam al-habibeh
|
cd36749e4e
|
files import fix
|
4 years ago |
|
Sultan Khan
|
8095e56b32
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
Sultan Khan
|
3ad928902b
|
voice command
|
4 years ago |
|
Elham Rababah
|
a359a6cd1a
|
fix the loader issue
|
4 years ago |
|
Mohammad Aljammal
|
b0fa7811e5
|
Merge branch 'insurance' into 'master'
women health
See merge request Cloud_Solution/diplomatic-quarter!65
|
4 years ago |
|
hussam al-habibeh
|
c6a9b66538
|
women health
|
4 years ago |
|
haroon amjad
|
a8ee7db62b
|
fixes
# Conflicts:
# lib/config/config.dart
|
4 years ago |
|
haroon amjad
|
41d50e23e3
|
covid drivethru implemented
|
4 years ago |
|
Sultan Khan
|
da317431ba
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
Elham Rababah
|
83ab1b4d61
|
fix issues in the services logic and add some translation
|
4 years ago |
|
Elham Rababah
|
da7131015e
|
remove print statements
|
4 years ago |
|
Mohammad Aljammal
|
847ccb9c07
|
Merge branch 'child_vaccines' into 'master'
Child vaccines
See merge request Cloud_Solution/diplomatic-quarter!62
|
4 years ago |
|
Sultan Khan
|
7b6135a6c7
|
voice search
|
4 years ago |
|
Sultan Khan
|
83bc2cddce
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
hussam al-habibeh
|
84f429e559
|
merge
|
4 years ago |
|
hussam al-habibeh
|
bafcc4331e
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into insurance
Conflicts:
lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
pubspec.yaml
|
4 years ago |
|
hussam al-habibeh
|
dbda69baa1
|
health Calculator'General Health'
|
4 years ago |