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 |
Elham Rababah
|
9ebc6980dd
|
change the checkup item based on service
|
4 years ago |
Elham Rababah
|
31b217aa19
|
First step from CMC
|
4 years ago |
Elham Rababah
|
0b9a834673
|
Finish cancel order
|
4 years ago |
Elham Rababah
|
293c557b54
|
First step from Home health care service
|
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 |
Amjad amireh
|
42fd2e0eee
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into child_vaccines
Conflicts:
lib/core/viewModels/base_view_model.dart
|
4 years ago |
Amjad amireh
|
98947d5f6b
|
Blood Denote
|
4 years ago |
Elham Rababah
|
fdc8ef36ef
|
Refactor today page
|
4 years ago |
Elham Rababah
|
0a60b27ab4
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into h20_E_referral
Conflicts:
lib/locator.dart
|
4 years ago |
Mohammad Aljammal
|
ac871bb416
|
Merge branch 'Blood_Donation' into 'master'
Blood donation
See merge request Cloud_Solution/diplomatic-quarter!58
|
4 years ago |
Elham Rababah
|
dd76ae05a7
|
fix H2O page issue
|
4 years ago |
Amjad amireh
|
5e50c0dc32
|
Blood Denote
|
4 years ago |
Mohammad Aljammal
|
020d10fccc
|
Merge branch 'insurance' into 'master'
Health Converter
See merge request Cloud_Solution/diplomatic-quarter!56
|
4 years ago |
Elham Rababah
|
37d9eae9ea
|
improve E-referral
|
4 years ago |
Elham Rababah
|
c994c39c6b
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into h20_E_referral
|
4 years ago |
Elham Rababah
|
a00bc8268e
|
improve E-referral
|
4 years ago |
Elham Rababah
|
91a8b94382
|
Merge branch 'E_referral' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into h20_E_referral
Conflicts:
lib/config/config.dart
lib/locator.dart
lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
lib/pages/landing/landing_page.dart
|
4 years ago |
Elham Rababah
|
b1b6c77d62
|
Finish H2O Services
|
4 years ago |
hussam al-habibeh
|
3e184f43db
|
Health Converter
|
4 years ago |
Elham Rababah
|
b853bede68
|
first step from h2o
|
4 years ago |
Amjad amireh
|
43689d19ce
|
Contact us , virtual tout ,News
|
4 years ago |
Amjad amireh
|
9a6eadc3fb
|
Contact us and virtual tout
|
4 years ago |
Elham Rababah
|
ae147b5988
|
first step from search referrals
|
4 years ago |
Elham Rababah
|
1e3ff89dbd
|
finish new e-referral except calling the service
|
4 years ago |
hussam al-habibeh
|
3c5adc0a1d
|
HMG Service layout
|
4 years ago |
Elham Rababah
|
f582eee991
|
make index page of add new referral as page controller
|
4 years ago |
Elham Rababah
|
a4905783ad
|
refactor dialogs structure
|
4 years ago |
Elham Rababah
|
7840ec4c3b
|
finish activation process until step 2
|
4 years ago |
Elham Rababah
|
f1f3b6bd56
|
first step from e-referral
|
4 years ago |
Mohammad Aljammal
|
d16ea676cf
|
done parking service ,fix design issues in home page and add new icon
|
4 years ago |
Mohammad Aljammal
|
895c09efa4
|
parking service
|
4 years ago |