Elham Rababah
|
9f2beceb22
|
First step from notifications_page
|
4 years ago |
Mohammad Aljmma
|
e42f953bd1
|
fix prescription report issues
|
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
|
d4be20b07b
|
add icons
|
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 |
Mohammad Aljmma
|
856ab52439
|
fix ui issues
|
4 years ago |
Mohammad Aljmma
|
894494ec4e
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into home_page
Conflicts:
ios/Flutter/.last_build_id
lib/main.dart
lib/pages/landing/home_page.dart
|
4 years ago |
Mohammad Aljmma
|
874de15040
|
change the home page design
|
4 years ago |
haroon amjad
|
d5118bda11
|
Login / Register UI fixes
|
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 |
haroon amjad
|
22ef24c4ff
|
Merge branch 'master' into Haroon
# Conflicts:
# android/app/src/main/AndroidManifest.xml
|
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 |
jammal
|
bd2254491c
|
done ER service
|
4 years ago |
Sultan Khan
|
f03a711dff
|
symptom checker gender page updated
|
4 years ago |
haroon amjad
|
6b316bf262
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
# android/app/src/main/AndroidManifest.xml
# lib/config/config.dart
# lib/pages/AlHabibMedicalService/ health_calculators.dart
# lib/pages/BookAppointment/widgets/DoctorView.dart
# lib/pages/ContactUs/LiveChat/hospitalsLivechat_page.dart
|
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
|
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 |
Sultan Khan
|
8095e56b32
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
Amjad amireh
|
83735ab68d
|
modified Child vaccintion note
|
4 years ago |
haroon amjad
|
a8ee7db62b
|
fixes
# Conflicts:
# lib/config/config.dart
|
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 |
Mohammad Aljammal
|
06416b4934
|
add Not authenticated Page
|
4 years ago |
haroon amjad
|
5f36c900a4
|
fixes
|
4 years ago |
haroon amjad
|
0daa0dc683
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
|
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 |
Amjad amireh
|
67e3a13a95
|
child Vaccines add new child modified
|
4 years ago |
Sultan Khan
|
8f18d1025a
|
voice search
|
4 years ago |
Elham Rababah
|
9ebc6980dd
|
change the checkup item based on service
|
4 years ago |
Amjad amireh
|
1d29aa36a2
|
child Vaccines
|
4 years ago |
Amjad amireh
|
fe17c20bdf
|
child Vaccines
|
4 years ago |
Elham Rababah
|
31b217aa19
|
First step from CMC
|
4 years ago |
Sultan Khan
|
227731f8f8
|
Merge
|
4 years ago |
Amjad amireh
|
e14d619edd
|
child Vaccines
|
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 |
Mohammad Aljammal
|
0d12210116
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into my_trackers
|
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 |
Mohammad Aljammal
|
f543126152
|
Ambulance Service
|
4 years ago |
haroon amjad
|
6c0bb12c84
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# 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 |
haroon amjad
|
929e289a6f
|
started implementing Covid-19 DriveThru Test Module
|
4 years ago |
Amjad amireh
|
a00b3a133c
|
Blood Denote
|
4 years ago |
haroon amjad
|
7fdc0da9dc
|
livecare scheduling implemented
|
4 years ago |
Amjad amireh
|
5e50c0dc32
|
Blood Denote
|
4 years ago |
Elham Rababah
|
bf6a8cecc6
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into h20_E_referral
Conflicts:
lib/config/config.dart
lib/locator.dart
lib/pages/landing/landing_page.dart
pubspec.yaml
|
4 years ago |
Mohammad Aljammal
|
bae6fe4ad6
|
fix marge issues
|
4 years ago |
Elham Rababah
|
37d9eae9ea
|
improve E-referral
|
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
|
3ffff9686d
|
Done allergies service
|
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 |
Elham Rababah
|
b853bede68
|
first step from h2o
|
4 years ago |
Mohammad Aljammal
|
82c2577d36
|
Done ask doctor service
|
4 years ago |
Sultan Khan
|
03ff56f2de
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
Elham Rababah
|
ae147b5988
|
first step from search referrals
|
4 years ago |
Mohammad Aljammal
|
82226e62e1
|
Merge branch 'insurance' into 'master'
HMG Service layout
See merge request Cloud_Solution/diplomatic-quarter!52
|
4 years ago |
Mohammad Aljammal
|
2952fd56ab
|
Done Active Medications Service
|
4 years ago |
Elham Rababah
|
1e3ff89dbd
|
finish new e-referral except calling the service
|
4 years ago |
Amjad amireh
|
24693f2992
|
Contact us
|
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 |
Mohammad Aljammal
|
9f06ce7d1d
|
done EyeMeasurements service
|
4 years ago |
Amjad amireh
|
c2b7507005
|
Contact us
|
4 years ago |
Elham Rababah
|
7840ec4c3b
|
finish activation process until step 2
|
4 years ago |
Mohammad Aljammal
|
c01e6095f2
|
done my trackers
|
4 years ago |
Elham Rababah
|
f1f3b6bd56
|
first step from e-referral
|
4 years ago |
Mohammad Aljammal
|
14f3e08077
|
Merge branch 'amjad_amireh' into 'master'
edit card_position.dart
See merge request Cloud_Solution/diplomatic-quarter!47
|
4 years ago |
Mohammad Aljammal
|
4ac77593ad
|
add payment service page and translations
|
4 years ago |
Mohammad Aljammal
|
a0300738e8
|
done My balance
|
4 years ago |
Amjad amireh
|
368db03ab8
|
edit card_position.dart
|
4 years ago |
Sultan Khan
|
da7fa1038a
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
Mohammad Aljammal
|
57ed83a139
|
Merge branch 'vaccine' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into patient_sick_leave
Conflicts:
lib/config/config.dart
|
4 years ago |
Mohammad Aljammal
|
11f9daa3ff
|
add PatientSickLeave
|
4 years ago |
Sultan Khan
|
63e6d06e74
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
Mohammad Aljammal
|
ea02622977
|
fix merge issues
|
4 years ago |
Mohammad Aljammal
|
fbb4b326a8
|
Merge branch 'amjad_amireh' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into amjad_amireh
Conflicts:
lib/locator.dart
pubspec.yaml
|
4 years ago |
Mohammad Aljammal
|
8e96c79d05
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into amjad_amireh
Conflicts:
lib/config/localized_values.dart
|
4 years ago |
Mohammad Aljammal
|
33bd972984
|
add my vaccines item screen
|
4 years ago |
Sultan Khan
|
3dc54230be
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
Mohammad Aljammal
|
9159928e27
|
edit on vaccine service
|
4 years ago |
Mohammad Aljammal
|
ed1c04ab25
|
ER
|
4 years ago |
Sultan Khan
|
7908506d5f
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
Mohammad Aljammal
|
153335538a
|
done monthly reports
|
4 years ago |
Sultan Khan
|
a98bc226e6
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
Mohammad Aljammal
|
20f9f6f06c
|
ER
|
4 years ago |
Mohammad Aljammal
|
b0f0b87345
|
fix merge issues
|
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 |
Mohammad Aljammal
|
fe66ee5993
|
fix lab result issues
|
4 years ago |