haroon amjad
|
0181043da8
|
Ereferral fixes, smartwatch health data integration
|
4 years ago |
Mohammad Aljammal
|
2185f5ce11
|
Merge branch 'hhc_cmc' into 'master'
Hhc cmc
See merge request Cloud_Solution/diplomatic-quarter!138
|
4 years ago |
Elham Rababah
|
05deaa6322
|
Address Added Successfully
|
4 years ago |
Sultan Khan
|
de2a5e55eb
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
Sultan Khan
|
7d3c1ac852
|
weather indicator updated
|
4 years ago |
Zohaib Kambrani
|
27182ee8db
|
no message
|
4 years ago |
Mohammad Aljammal
|
54d8965773
|
done child Vaccination
|
4 years ago |
haroon amjad
|
97b8aeeff5
|
Version Control finished
|
4 years ago |
haroon amjad
|
a03d5c6d57
|
App initial release to stores
|
4 years ago |
Sultan Khan
|
909401cc7e
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
4 years ago |
Elham Rababah
|
7aa7af6de7
|
finish CMC module
|
4 years ago |
haroon amjad
|
92db2b2be9
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
|
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
|
49974f81db
|
add translations to child Vaccination
|
4 years ago |
haroon amjad
|
e5feef8a9d
|
Updates & UI Fixes
|
4 years ago |
Sultan Khan
|
0f80224016
|
Merge branch 'sultan' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
|
4 years ago |
Mohammad Aljammal
|
a556e8c1f8
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter
Conflicts:
lib/config/config.dart
lib/pages/landing/home_page.dart
lib/pages/landing/landing_page.dart
|
4 years ago |
Mohammad Aljammal
|
482ec536de
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fixing
Conflicts:
lib/config/config.dart
|
4 years ago |
Mohammad Aljammal
|
b6d2878cf1
|
add Radiology translations and colors
|
4 years ago |
Fatimah Alshammari
|
d328c74fc4
|
fix order and orderdetails
|
4 years ago |
Mohammad Aljammal
|
d0891ba16b
|
Merge branch 'hot_fixing' into 'diplomatic-quarter-live'
fix lab result translations and colors
See merge request Cloud_Solution/diplomatic-quarter!128
|
4 years ago |
Mohammad Aljammal
|
b504f379de
|
fix lab result translations and colors
|
4 years ago |
Sultan Khan
|
1b678e0aca
|
fingerprint
|
4 years ago |
Sultan Khan
|
24b7bca471
|
no message
|
4 years ago |
Sultan Khan
|
8429f83d7c
|
registration done
|
4 years ago |
Mohammad Aljammal
|
f70ca95a38
|
fix merge issues
|
4 years ago |
Mohammad Aljammal
|
0d098def04
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_master
Conflicts:
assets/app_icons/config.json
assets/app_icons/fonts/DQIcons.ttf
lib/config/config.dart
lib/config/shared_pref_kay.dart
lib/d_q_icons_icons.dart
lib/locator.dart
lib/pages/landing/home_page.dart
lib/pages/landing/landing_page.dart
lib/pages/rateAppointment/rate_appointment_doctor.dart
lib/uitl/utils.dart
lib/widgets/others/app_scaffold_widget.dart
|
4 years ago |
Mohammad Aljammal
|
67cc5e2033
|
fix Prescriptions
|
4 years ago |
Mohammad Aljammal
|
0966269537
|
Merge branch 'sultan' into 'diplomatic-quarter-live'
Sultan
See merge request Cloud_Solution/diplomatic-quarter!116
|
4 years ago |
Mohammad Aljammal
|
3c1257b379
|
fix Medicine Search
|
4 years ago |
Sultan Khan
|
30a8e24521
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
Sultan Khan
|
91be66ecdd
|
family file changes
|
4 years ago |
Mohammad Aljmma
|
6523a1dea9
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into arabic_issues
Conflicts:
lib/config/localized_values.dart
|
4 years ago |
Mohammad Aljmma
|
501692587f
|
change the base Url
|
4 years ago |
Mohammad Aljmma
|
a9b11a6b03
|
fix lab result
|
4 years ago |
Sultan Khan
|
3589b21590
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
Mohammad Aljmma
|
770d28033d
|
fix issues#26 & 27 & 28
|
4 years ago |
Mohammad Aljmma
|
ed7b9d609f
|
fix lab result
|
4 years ago |
haroon amjad
|
b81af62551
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
|
4 years ago |
haroon amjad
|
b89c1f03b3
|
language translation fixes
|
4 years ago |
Sultan Khan
|
bedafa24cd
|
insurance details
|
4 years ago |
Mohammad Aljmma
|
8f38dc6077
|
fix issue #24
|
4 years ago |
Sultan Khan
|
1eb6516ea6
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
Sultan Khan
|
3fef1b9d52
|
theme and login issues fixed
|
4 years ago |
Mohammad Aljmma
|
59defa4532
|
fix issue #15
|
4 years ago |
Mohammad Aljmma
|
5e8b61bf2d
|
fix issue #13
|
4 years ago |
Mohammad Aljmma
|
a742f896be
|
fix issue#4
|
4 years ago |
Mohammad Aljmma
|
e1f6ef5e5b
|
fix Prescriptions history
|
4 years ago |
hussam al-habibeh
|
69ea8b7bd7
|
daynmic products listing
|
4 years ago |
Sultan Khan
|
283473a06a
|
theme changes
|
4 years ago |
Sultan Khan
|
d1336eec8b
|
login type
|
4 years ago |
Sultan Khan
|
f05b235cd0
|
login issue
|
4 years ago |
Sultan Khan
|
cced69502a
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
Sultan Khan
|
aa8f9f18e1
|
forgot password
|
4 years ago |
Fatimah Alshammari
|
ddf032bb47
|
Merge branch 'pharmacy' into pharmacy-Fatima
# Conflicts:
# android/app/build.gradle
# android/app/src/main/AndroidManifest.xml
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/pages/landing/home_page.dart
# lib/uitl/translations_delegate_base.dart
|
4 years ago |
Fatimah Alshammari
|
f137bd44c0
|
created order and order details UI pages
|
4 years ago |
haroon amjad
|
94fb41581e
|
config update
|
4 years ago |
haroon amjad
|
506e32e8c8
|
Payment issues resolved
|
4 years ago |
Sultan Khan
|
4976870d2e
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
Sultan Khan
|
875bf10c73
|
settings page added
|
4 years ago |
Mohammad Aljmma
|
6a83538544
|
add info for Medical
|
4 years ago |
Elham Rababah
|
64f970c40c
|
Fix issues after the merge
|
4 years ago |
Elham Rababah
|
5ed4d76a54
|
Merge branches 'diplomatic-quarter-live' and 'notifications_page' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into notifications_page
Conflicts:
lib/config/localized_values.dart
lib/uitl/translations_delegate_base.dart
|
4 years ago |
Sultan Khan
|
0443a37886
|
register page updated
|
4 years ago |
hussam al-habibeh
|
7815005e21
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-hussam
Conflicts:
lib/config/config.dart
lib/locator.dart
lib/pages/landing/home_page.dart
lib/widgets/others/app_scaffold_widget.dart
|
4 years ago |
hussam al-habibeh
|
69a6bc2812
|
offers page
|
4 years ago |
Elham Rababah
|
5bd3c7d9ce
|
finish step from notifications_page and create notification_details_page
|
4 years ago |
Sultan Khan
|
d939b2ec9b
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
Sultan Khan
|
f8e05fc447
|
regiter issue
|
4 years ago |
mosazaid
|
11ff27bae3
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_module_feature_home_page
Conflicts:
lib/config/config.dart
lib/config/localized_values.dart
lib/pages/landing/landing_page.dart
lib/uitl/translations_delegate_base.dart
lib/widgets/others/app_scaffold_widget.dart
pubspec.yaml
|
4 years ago |
mosazaid
|
9a169ff77b
|
finish home page and start working on order preview page
|
4 years ago |
Elham Rababah
|
9f2beceb22
|
First step from notifications_page
|
4 years ago |
Mohammad Aljmma
|
e42f953bd1
|
fix prescription report issues
|
4 years ago |
enadhilal
|
778e9fd8da
|
Merge branch 'pharmacy_module_feature_home_page' into enad_pharmacy2
# Conflicts:
# lib/core/service/client/base_app_client.dart
# lib/pages/landing/home_page.dart
|
4 years ago |
hussam al-habibeh
|
e74e168e88
|
Merge branch 'pharmacy_module_feature_home_page' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-hussam
Conflicts:
android/app/build.gradle
lib/config/config.dart
lib/core/service/client/base_app_client.dart
lib/locator.dart
|
4 years ago |
hussam al-habibeh
|
f7cee8f484
|
pharmacy module app && category home page
|
4 years ago |
mosazaid
|
d1ac4080ca
|
working on pharmacy home page
|
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 |
Fatimah Alshammari
|
1e00b9a4d8
|
added my-profile
|
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 |
enadhilal
|
613206f9d3
|
Merge branch 'enad_pharmacy2' into pharmacy
# Conflicts:
# lib/config/config.dart
# lib/widgets/others/app_scaffold_widget.dart
|
4 years ago |
enadhilal
|
5445cced89
|
Merge branch 'master' into enad_pharmacy2
# Conflicts:
# lib/config/config.dart
# lib/widgets/others/app_scaffold_widget.dart
|
4 years ago |
enadhilal
|
bf88d84022
|
Merge branch 'pharmacy' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into enad_pharmacy
# Conflicts:
# lib/config/config.dart
# lib/widgets/others/app_scaffold_widget.dart
|
4 years ago |
enadhilal
|
068382e76f
|
add call for backend 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 |
Sultan Khan
|
f6a3f0e615
|
family file
|
4 years ago |
Mohammad Aljammal
|
02ce04a397
|
medical_profile_page.dart
|
4 years ago |
haroon amjad
|
51078227ab
|
Dental appointment flow implemented
|
4 years ago |
Mohammad Aljammal
|
d52e612bff
|
Merge branch 'insurance' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into dashboard
Conflicts:
lib/config/config.dart
lib/locator.dart
lib/pages/medical/medical_profile_page.dart
pubspec.yaml
|
4 years ago |
Mohammad Aljammal
|
1b3a780a29
|
add ar lan for medical profile
|
4 years ago |
hussam al-habibeh
|
3a79ddb488
|
vaccine service
|
4 years ago |
Sultan Khan
|
826c50ebf1
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
haroon amjad
|
1886f3a763
|
implementing Dental Appointment flow
|
4 years ago |
Sultan Khan
|
4a75215a19
|
search
|
4 years ago |
Mohammad Aljammal
|
5ec3935c68
|
ER
|
4 years ago |
Mohammad Aljammal
|
ef4a57223c
|
fix DoctorView.dart UI issues
|
4 years ago |
haroon amjad
|
35cd02494c
|
implemented search by doctor list
|
4 years ago |
haroon amjad
|
13adb46319
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
# lib/config/localized_values.dart
# lib/config/shared_pref_kay.dart
|
4 years ago |
haroon amjad
|
f669adcb9d
|
Location service implemented
|
4 years ago |
Mohammad Aljammal
|
91e5a20fd0
|
fix merge issues
|
4 years ago |
Mohammad Aljammal
|
54b766de81
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into dashboard
Conflicts:
lib/config/config.dart
lib/config/localized_values.dart
lib/config/shared_pref_kay.dart
lib/uitl/translations_delegate_base.dart
lib/widgets/others/app_scaffold_widget.dart
|
4 years ago |
Mohammad Aljammal
|
01a011a03d
|
done dashboard page
|
4 years ago |
Sultan Khan
|
3247378c02
|
search
|
4 years ago |
Mohammad Aljammal
|
895c09efa4
|
parking service
|
4 years ago |
Sultan Khan
|
8516f7de1b
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
Mohammad Aljammal
|
4adc2916b4
|
fix merge issues
|
4 years ago |
Mohammad Aljammal
|
30c0963063
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into dashboard
Conflicts:
lib/config/localized_values.dart
lib/locator.dart
lib/pages/landing/home_page.dart
lib/pages/landing/landing_page.dart
lib/uitl/translations_delegate_base.dart
|
4 years ago |
Mohammad Aljammal
|
8989fbc9b7
|
done design dashboard
|
4 years ago |
Sultan Khan
|
cb99b2a7a7
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
Sultan Khan
|
327c4585a6
|
family file change
|
4 years ago |
haroon amjad
|
760db6a873
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
# lib/locator.dart
|
4 years ago |
haroon amjad
|
cc4f5c0615
|
updates
|
4 years ago |
Mohammad Aljammal
|
9cf5c80aae
|
add time line and appointment rate
|
4 years ago |
Mohammad Aljammal
|
f6d30178bf
|
done medical report
|
4 years ago |
Mohammad Aljammal
|
b6319c558c
|
Merge branch 'report_service' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into vital_sign
Conflicts:
lib/locator.dart
lib/pages/medical/medical_profile_page.dart
|
4 years ago |
haroon amjad
|
db30fbdfd2
|
implementing livecare
|
4 years ago |
Sultan Khan
|
47c42808fd
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
haroon amjad
|
73cf37a3a5
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
# lib/core/service/client/base_app_client.dart
|
4 years ago |
Sultan Khan
|
03b34115c4
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
Sultan Khan
|
3b2f9251dc
|
search
|
4 years ago |
Mohammad Aljammal
|
a5e63817f2
|
done vital sign
|
4 years ago |
Sultan Khan
|
4c1a8dc38f
|
new changes
|
4 years ago |
Mohammad Aljammal
|
32e2732c43
|
feedback service
|
4 years ago |
Amjad Amireh
|
97dbe62f93
|
done report service
|
4 years ago |
haroon amjad
|
7972d01dff
|
Insurance Approval implemented
|
4 years ago |
haroon amjad
|
fde47a5c2c
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
# android/app/src/main/AndroidManifest.xml
# lib/core/service/client/base_app_client.dart
|
4 years ago |
haroon amjad
|
750746aabe
|
updates & fixes
|
4 years ago |
Mohammad Aljammal
|
d093ecd5e6
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into vital_sign
Conflicts:
ios/Podfile
ios/Runner.xcodeproj/project.pbxproj
lib/config/config.dart
lib/uitl/translations_delegate_base.dart
|
4 years ago |
Mohammad Aljammal
|
b4b33be3e9
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
Conflicts:
lib/core/service/client/base_app_client.dart
|
4 years ago |
Mohammad Aljammal
|
37b874fe3f
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into vital_sign
Conflicts:
lib/config/localized_values.dart
lib/uitl/translations_delegate_base.dart
|
4 years ago |
Mohammad Aljammal
|
a1fa2c0727
|
done vital sign
|
4 years ago |
Sultan Khan
|
adbdd2dd0d
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
Sultan Khan
|
621870eca1
|
family file changes
|
4 years ago |
haroon amjad
|
7d0efda1c4
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
# android/app/src/main/AndroidManifest.xml
# lib/config/localized_values.dart
# lib/core/service/client/base_app_client.dart
# lib/pages/landing/landing_page.dart
# lib/pages/login/confirm-login.dart
# lib/pages/medical/medical_profile_page.dart
# lib/services/authentication/auth_provider.dart
# lib/uitl/translations_delegate_base.dart
# pubspec.yaml
|
4 years ago |
hussam al-habibeh
|
f77d4fac66
|
insurance translation
|
4 years ago |
Haroon Amjad
|
8ad2941836
|
Appointment payment finalised, Ask Doc implemeted & other updates
|
4 years ago |
Haroon Amjad
|
41c922bfeb
|
Appointment payment implemented, Book Success implemented, Appointment flow implemented
|
4 years ago |
haroon amjad
|
3a9fa97c91
|
updates
|
4 years ago |
Mohammad Aljammal
|
5cee1cef4e
|
fix merge issues
|
4 years ago |
Mohammad Aljammal
|
2e0afdb49c
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into insurance
Conflicts:
lib/config/config.dart
lib/locator.dart
lib/pages/medical/medical_profile_page.dart
lib/pages/medical/prescriptions/prescriptions_home_page.dart
|
4 years ago |
Sultan Khan
|
d1871bb71f
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
Sultan Khan
|
8ee3b3b557
|
family files.
|
4 years ago |
hussam al-habibeh
|
492cfa084b
|
insurance card and insurance update and insurance approval
|
4 years ago |
Mohammad Aljammal
|
002efe3b45
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into medical_profile
Conflicts:
lib/pages/landing/landing_page.dart
|
4 years ago |
Mohammad Aljammal
|
5ea0df9f1e
|
Merge remote-tracking branch 'origin/sultan' into sultan
# Conflicts:
# lib/uitl/date_uitl.dart
|
4 years ago |
Mohammad Aljammal
|
cfd5b2ccff
|
feedback Service done
|
4 years ago |
Sultan Khan
|
8e3fb6831d
|
registration changes
|
4 years ago |
haroon amjad
|
28fde5c500
|
My Appointments implemented, Appointment Details functionality updated, Logged In User details added in APIs & other updates
|
4 years ago |
Mohammad Aljammal
|
29768feefd
|
merge master
|
4 years ago |
Mohammad Aljammal
|
05222207da
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into medical_profile
Conflicts:
lib/config/config.dart
lib/core/service/client/base_app_client.dart
|
4 years ago |
Mohammad Aljammal
|
a12197fe70
|
labs result done add some file to git ignore for ios
|
4 years ago |
haroon amjad
|
00d9214460
|
Merge branch 'sultan' 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
# lib/widgets/others/app_scaffold_widget.dart
|
4 years ago |
Sultan Khan
|
ecfa1756d3
|
login changes
|
4 years ago |
Sultan Khan
|
0bc529f420
|
login changes
|
4 years ago |
Mohammad Aljammal
|
1bbbd18373
|
labs services
|
4 years ago |
Sultan Khan
|
9d0a2e1e43
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
Sultan Khan
|
8d0834ff3e
|
login inprogress
|
4 years ago |
haroon amjad
|
b3e5047820
|
Payment method selection page created, Appointment details functions implemented
|
4 years ago |
Mohammad Aljammal
|
940b327561
|
done Prescriptions
|
4 years ago |
haroon amjad
|
06f95c5379
|
Appointment Details implementation continued
|
4 years ago |
Sultan Khan
|
41b438fd74
|
login page changes
|
4 years ago |
haroon amjad
|
0171664779
|
Master Merged in to local
|
4 years ago |
haroon amjad
|
049d455e3c
|
Implementing appointment details functions
|
4 years ago |
Mohammad Aljammal
|
5874f4ba21
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into medical_profile
Conflicts:
lib/pages/landing/landing_page.dart
|
4 years ago |
Mohammad Aljammal
|
5a38479254
|
fix merge issues
|
4 years ago |
Mohammad Aljammal
|
1ac420ef7c
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
Conflicts:
lib/config/config.dart
lib/config/localized_values.dart
lib/uitl/translations_delegate_base.dart
|
4 years ago |
Sultan Khan
|
3a15c16883
|
login changes
|
4 years ago |
Mohammad Aljammal
|
43349542da
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into medical_profile
|
4 years ago |
Mohammad Aljammal
|
8de50bfe74
|
medical - my doctor and prescription services and pages
|
4 years ago |
haroon amjad
|
f5ddfabf50
|
Todo list implemented, Appointment details implemented, Appointment Reschedule implemented, Appointment Confirmed implemented
|
4 years ago |
hussam al-habibeh
|
e92cb2e1ac
|
Design and return Pharmacy List
|
4 years ago |
haroon amjad
|
7f4fbadfab
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
# lib/config/config.dart
# lib/pages/landing/landing_page.dart
|
4 years ago |
haroon amjad
|
d8fe501341
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
# lib/config/config.dart
# lib/pages/BookAppointment/BookingOptions.dart
# lib/services/appointment_services/GetDoctorsList.dart
# lib/uitl/translations_delegate_base.dart
# lib/widgets/others/app_scaffold_widget.dart
|
4 years ago |
Sultan Khan
|
31fe444150
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
Sultan Khan
|
b0989d6ca0
|
login pages changes
|
4 years ago |
Sultan Khan
|
76aeeffad7
|
login page changes
|
4 years ago |
Mohammad Aljammal
|
e147787be9
|
merge search and return medicine
|
4 years ago |
Mohammad Aljammal
|
01b230accf
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into SearchMedicineAndReturnMedicineList
Conflicts:
lib/config/config.dart
lib/config/localized_values.dart
lib/main.dart
lib/pages/landing/landing_page.dart
lib/uitl/translations_delegate_base.dart
pubspec.yaml
|
4 years ago |
Sultan Khan
|
5b411c3120
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
Sultan Khan
|
c018597d90
|
confrim login page added
|
4 years ago |
haroon amjad
|
e34da6485b
|
Doctor Free Slots implemented
|
4 years ago |
Mohammad Aljammal
|
4bc68c6afd
|
merge sultan
|
4 years ago |
Mohammad Aljammal
|
2d5b725818
|
Merge branch 'sultan' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_merge
Conflicts:
lib/config/config.dart
lib/config/localized_values.dart
lib/pages/landing/landing_page.dart
lib/uitl/translations_delegate_base.dart
|
4 years ago |
Mohammad Aljammal
|
b2875fbce3
|
merge haroun
|
4 years ago |
hussam al-habibeh
|
31d2816e64
|
design for search medicine and return medicine list
|
4 years ago |
Mohammad Aljammal
|
3a68e0e092
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into merge_haron
Conflicts:
lib/config/config.dart
lib/widgets/others/app_scaffold_widget.dart
|
4 years ago |
Sultan Khan
|
5a08cb720c
|
login changes
|
4 years ago |
Sultan Khan
|
f8d8e1c685
|
new pages added
|
4 years ago |
Sultan Khan
|
192b21a7e7
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
# Conflicts:
# lib/main.dart
# lib/widgets/input/date_picker/button_actions.dart
# lib/widgets/input/text_field.dart
# lib/widgets/others/app_scaffold_widget.dart
|
4 years ago |
Sultan Khan
|
8dd38a8b3c
|
no message
|
4 years ago |
haroon amjad
|
ca7b4534a8
|
Search By Clinic & Search By Doctor Name implemented
|
4 years ago |
Haroon Amjad
|
9eb9f01dbd
|
Get Clinic List API Implemented, Architecture for HTTP requests implemented
|
4 years ago |
haroon amjad
|
a0173c5b4d
|
Appointment Details page, ToDo List Page implemented
|
4 years ago |
Mohammad Aljammal
|
257cc92691
|
add MVVM and di Mohammad Aljammal and Elham Rababah
|
4 years ago |
haroon amjad
|
9842c3a0b1
|
Translation updates
|
4 years ago |
haroon amjad
|
1554a6bdf5
|
Book Appointment Flow added
|
4 years ago |
Sultan Khan
|
4a0cc17069
|
login module started
|
4 years ago |
Mohammad Aljammal
|
6d6c71655a
|
add new widget by Elham Rababah and Mohammad Aljammal
|
4 years ago |
Mohammad Aljammal
|
19676549e1
|
add base client, landing page, bottom_nav_bar , List Container, List Item, drawer progress indicator and asset file
|
4 years ago |
Mohammad Aljammal
|
3ed5c3878f
|
init project structure By Mohammad and Elham
|
4 years ago |