Mohammad Aljmma
|
54a7f98eff
|
fix login issues
|
4 years ago |
Mohammad Aljmma
|
a796e0392b
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_login
Conflicts:
lib/pages/login/confirm-login.dart
lib/pages/login/login.dart
|
4 years ago |
Mohammad Aljmma
|
f79d8eb8f9
|
fix login issues
|
4 years ago |
haroon amjad
|
af780bca76
|
registration fixes
|
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 |
haroon amjad
|
dbb53e7821
|
fixed forgot password issue, Implemented new loader in login flow
|
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 |
Mohammad Aljmma
|
59d592778b
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into home_page
|
4 years ago |
Mohammad Aljmma
|
e7e32a414b
|
fix barcode
|
4 years ago |
Mohammad Aljammal
|
1775766a08
|
Merge branch 'loader_fix' into 'diplomatic-quarter-live'
Fix loader issue.
See merge request Cloud_Solution/diplomatic-quarter!90
|
4 years ago |
Elham Rababah
|
fa88e9055f
|
make loader center
|
4 years ago |
Elham Rababah
|
042de21831
|
Fix loader issue.
|
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 |
umasoodch
|
23083fd5ad
|
Merge branch 'master' into pharmacy
# Conflicts:
# lib/config/config.dart
# lib/widgets/others/app_scaffold_widget.dart
|
4 years ago |
Mohammad Aljmma
|
d5afb50ed3
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into home_page
Conflicts:
lib/pages/landing/landing_page.dart
|
4 years ago |
Mohammad Aljmma
|
856ab52439
|
fix ui issues
|
4 years ago |
haroon amjad
|
6fd7a3fa3d
|
updates
|
4 years ago |
Mohammad Aljmma
|
89cfcd3cad
|
fix design issues
|
4 years ago |
Mohammad Aljmma
|
0b90d3c687
|
fix 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 |
Mohammad Aljammal
|
94c25d2188
|
Merge branch 'loader' into 'diplomatic-quarter-live'
Loader
See merge request Cloud_Solution/diplomatic-quarter!84
|
4 years ago |
Elham Rababah
|
6f5b5ed0c2
|
move gif loader utils
|
4 years ago |
Elham Rababah
|
bf412e1edf
|
Finish loader as Gif image in all cases where the network is busy
|
4 years ago |
haroon amjad
|
d5118bda11
|
Login / Register UI fixes
|
4 years ago |
Elham Rababah
|
cd7c354458
|
loader first step
|
4 years ago |
haroon amjad
|
3354058738
|
Branding updated according to DQ
|
4 years ago |
haroon amjad
|
3ae6df1dcb
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-live
|
4 years ago |
haroon amjad
|
6a630f6d33
|
logo & colors changed for login & registration flow
|
4 years ago |
Sultan Khan
|
deb828b4dd
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
Sultan Khan
|
23b48485ed
|
voice command
|
4 years ago |
Mohammad Aljmma
|
1cf4797d4f
|
add font
|
4 years ago |
Mohammad Aljmma
|
26cf849f2b
|
hot fixing
|
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
|
0b6cd845f1
|
implementing Smart Watch Integration
|
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 |
Fatimah Alshammari
|
56aa60f871
|
Merge branch 'pharmacy' into pharmacy-Fatima
|
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 |
jammal
|
57f938aa09
|
fix ios issues
|
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 |
jammal
|
0fceca8f3e
|
fix ios issues
|
4 years ago |
enadhilal
|
7ca6e6caa7
|
fix widget of product_tile
|
4 years ago |
enadhilal
|
d6d1c26c9a
|
add product_tile widget
|
4 years ago |
enadhilal
|
068382e76f
|
add call for backend service
|
4 years ago |
haroon amjad
|
68b0e3857a
|
updates
|
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 |
enadhilal
|
815bc39268
|
add wishlist page
|
4 years ago |
haroon amjad
|
7edb6fd179
|
UI Fixes in LiveCare
|
4 years ago |
Mohammad Aljammal
|
e025321c71
|
fix issues
|
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 |
Sultan Khan
|
d0d262f139
|
robot icon updates
|
4 years ago |
hussam al-habibeh
|
cd36749e4e
|
files import fix
|
4 years ago |
Elham Rababah
|
c0a54c8cbc
|
remove commit
|
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 |
Mohammad Aljammal
|
39a4020b69
|
Merge branch 'child_vaccines' into 'master'
Child vaccines
See merge request Cloud_Solution/diplomatic-quarter!64
|
4 years ago |
hussam al-habibeh
|
c6a9b66538
|
women health
|
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 |
haroon amjad
|
41d50e23e3
|
covid drivethru implemented
|
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
|
8ddec0ad99
|
child Vaccines add new child modified
|
4 years ago |
Amjad amireh
|
67e3a13a95
|
child Vaccines add new child modified
|
4 years ago |
Fatimah Alshammari
|
d05988a679
|
added pharmacy folder
|
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 |
Amjad amireh
|
cb2a78e2ee
|
child Vaccines
|
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 |
Sultan Khan
|
8f18d1025a
|
voice search
|
4 years ago |
Amjad amireh
|
24795e808f
|
child Vaccines
|
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 |
Amjad amireh
|
dcb93bf5cc
|
child Vaccines
|
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 |
Mohammad Aljammal
|
1ce55e687f
|
Ambulance Service second step
|
4 years ago |
Amjad amireh
|
6830996f9c
|
child Vaccines
|
4 years ago |
Amjad amireh
|
8a6511404f
|
child Vaccines
|
4 years ago |
Amjad amireh
|
42554ffa67
|
child Vaccines
|
4 years ago |
haroon amjad
|
063eebfc74
|
covid drivethru implemented
|
4 years ago |
Elham Rababah
|
31b217aa19
|
First step from CMC
|
4 years ago |
Amjad amireh
|
4009aed000
|
child Vaccines
|
4 years ago |
Sultan Khan
|
227731f8f8
|
Merge
|
4 years ago |
Amjad amireh
|
e14d619edd
|
child Vaccines
|
4 years ago |
Amjad amireh
|
37b817e0c8
|
child Vaccines
|
4 years ago |
Amjad amireh
|
0e4ff1f804
|
child Vaccines
|
4 years ago |
Elham Rababah
|
0b9a834673
|
Finish cancel order
|
4 years ago |
Amjad amireh
|
9ab0d66888
|
child Vaccines
|
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
|
3d6eafe473
|
Ambulance Service first step
|
4 years ago |
Amjad amireh
|
db19eec35f
|
Blood Denote
|
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
|
20ef255ee6
|
Blood Denote
|
4 years ago |
Amjad amireh
|
98947d5f6b
|
Blood Denote
|
4 years ago |
Mohammad Aljammal
|
0d12210116
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into my_trackers
|
4 years ago |
Mohammad Aljammal
|
c7d396875e
|
Ambulance Service steps
|
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
|
b658e7be4d
|
Blood Denote
|
4 years ago |
Elham Rababah
|
dd76ae05a7
|
fix H2O page issue
|
4 years ago |
Amjad amireh
|
a00b3a133c
|
Blood Denote
|
4 years ago |
Amjad amireh
|
675d544514
|
Blood Denote
|
4 years ago |
haroon amjad
|
7fdc0da9dc
|
livecare scheduling implemented
|
4 years ago |
Amjad amireh
|
0ec39920f0
|
Blood Denote
|
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
|
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
|
3fab844ac9
|
improve E-referral
|
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 |
Mohammad Aljammal
|
d6a27a8e28
|
change medical profile icons
|
4 years ago |
haroon amjad
|
c9256a654a
|
LiveCare Scheduling updates
|
4 years ago |
Mohammad Aljammal
|
3ffff9686d
|
Done allergies service
|
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 |
Mohammad Aljammal
|
82c2577d36
|
Done ask doctor service
|
4 years ago |
Amjad amireh
|
9a6eadc3fb
|
Contact us and virtual tout
|
4 years ago |
Sultan Khan
|
79502de682
|
update
|
4 years ago |
Sultan Khan
|
03ff56f2de
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
Mohammad Aljammal
|
986a2e92f6
|
Merge branch 'find_us' into 'master'
Find us
See merge request Cloud_Solution/diplomatic-quarter!54
|
4 years ago |
Amjad amireh
|
7c48a6f16a
|
Contact us
|
4 years ago |
Amjad amireh
|
5ce252d296
|
Contact us
|
4 years ago |
Amjad amireh
|
50d862b076
|
Contact us
|
4 years ago |
Amjad amireh
|
97d0c439c7
|
Contact us
|
4 years ago |
Amjad amireh
|
5f981c9248
|
Contact us
|
4 years ago |
haroon amjad
|
06798ef327
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
# lib/pages/ContactUs/findus/hospitrals_page.dart
# lib/pages/ContactUs/findus/pharmacies_page.dart
|
4 years ago |
haroon amjad
|
f25d18353f
|
icons updated
|
4 years ago |
Sultan Khan
|
591e9e9a4c
|
updated
|
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
|
aa66e427b1
|
Contact us
|
4 years ago |
Amjad amireh
|
24456895ee
|
Contact us
|
4 years ago |
Amjad amireh
|
24693f2992
|
Contact us
|
4 years ago |
Amjad amireh
|
de5633d58b
|
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 |
Amjad amireh
|
6aa6b85f4b
|
Contact us
|
4 years ago |
Amjad amireh
|
c2cfea7360
|
Contact us
|
4 years ago |
Amjad amireh
|
571023e521
|
Contact us
|
4 years ago |
Mohammad Aljammal
|
9f06ce7d1d
|
done EyeMeasurements service
|
4 years ago |
Amjad amireh
|
c2b7507005
|
Contact us
|
4 years ago |
Amjad amireh
|
dd3608e9ee
|
Contact us
|
4 years ago |
Elham Rababah
|
a4905783ad
|
refactor dialogs structure
|
4 years ago |
Elham Rababah
|
7840ec4c3b
|
finish activation process until step 2
|
4 years ago |
Mohammad Aljammal
|
c01e6095f2
|
done my trackers
|
4 years ago |
Amjad amireh
|
a4ea5f8e3e
|
Contact us
|
4 years ago |
Elham Rababah
|
f1f3b6bd56
|
first step from e-referral
|
4 years ago |
haroon amjad
|
b9a0438ebb
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
|
4 years ago |
haroon amjad
|
a5fd9f53ab
|
Payment flow implemented in advance payment
|
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 |
haroon amjad
|
478917b240
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
|
4 years ago |
Mohammad Aljammal
|
b4a7408962
|
Merge branch 'payment_service' into 'master'
add payment service page and translations
See merge request Cloud_Solution/diplomatic-quarter!49
|
4 years ago |
Mohammad Aljammal
|
4ac77593ad
|
add payment service page and translations
|
4 years ago |
haroon amjad
|
38c980be81
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
|
4 years ago |
haroon amjad
|
5400d534db
|
updates for push notifications
|
4 years ago |
Mohammad Aljammal
|
b6db1d1fd8
|
Merge branch 'my_balance' into 'master'
done My balance
See merge request Cloud_Solution/diplomatic-quarter!48
|
4 years ago |
Mohammad Aljammal
|
a0300738e8
|
done My balance
|
4 years ago |
Amjad amireh
|
368db03ab8
|
edit card_position.dart
|
4 years ago |
Amjad amireh
|
a41dd736c4
|
edit card_position.dart
|
4 years ago |
Amjad amireh
|
d1a01f5afa
|
edit card_position.dart
|
4 years ago |
Sultan Khan
|
92efbcbd2f
|
my family
|
4 years ago |
Sultan Khan
|
da7fa1038a
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
Sultan Khan
|
0a2cb22042
|
design issues fixed
|
4 years ago |
Amjad amireh
|
6fb063bf48
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into amjad_amireh
|
4 years ago |
Amjad amireh
|
dc10f883db
|
Merge branch 'amjad_amireh' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into amjad_amireh
|
4 years ago |
Mohammad Aljammal
|
4dd3f9ad01
|
done Patient Sick Leave
|
4 years ago |
Amjad amireh
|
525080c09e
|
edit card_position.dart
|
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 |
Sultan Khan
|
5e252d21d2
|
voice search added more medical option
|
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 |
Amjad amireh
|
62d96a3f1c
|
edit card_position.dart
|
4 years ago |
Sultan Khan
|
f5d6864291
|
voice search coc
|
4 years ago |
Sultan Khan
|
3dc54230be
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
Sultan Khan
|
5d34398998
|
insurance updated
|
4 years ago |
Mohammad Aljammal
|
9159928e27
|
edit on vaccine service
|
4 years ago |
Sultan Khan
|
a535543863
|
more pages added on the voice search
|
4 years ago |
Amjad amireh
|
e638464657
|
edit card_position.dart
|
4 years ago |
Mohammad Aljammal
|
ddf53ce999
|
ER
|
4 years ago |
Mohammad Aljammal
|
50d1e50df4
|
ER
|
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
|
294a752338
|
ER
|
4 years ago |
Sultan Khan
|
77f6dd94ef
|
search page change
|
4 years ago |
haroon amjad
|
8387af844a
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
|
4 years ago |
haroon amjad
|
0628aef62a
|
applied dental change in SearchByClinic
|
4 years ago |
Mohammad Aljammal
|
629251d216
|
ER
|
4 years ago |
Mohammad Aljammal
|
b7f73bf397
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into monthly_reports
|
4 years ago |
Mohammad Aljammal
|
153335538a
|
done monthly reports
|
4 years ago |
Sultan Khan
|
a2b3878a27
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
Sultan Khan
|
a98bc226e6
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
Mohammad Aljammal
|
5485cbab36
|
ER
|
4 years ago |
Mohammad Aljammal
|
2ef36d3d8a
|
ER
|
4 years ago |
Mohammad Aljammal
|
f534f8a348
|
ER
|
4 years ago |
Sultan Khan
|
0f63b922d1
|
speech to text
|
4 years ago |
Mohammad Aljammal
|
20f9f6f06c
|
ER
|
4 years ago |
haroon amjad
|
cbf19f0cd1
|
Merge branch 'master' into 'Haroon'
# Conflicts:
# lib/core/service/client/base_app_client.dart
|
4 years ago |
Mohammad Aljammal
|
b0f0b87345
|
fix merge issues
|
4 years ago |
haroon amjad
|
c5794e5c70
|
Dental flow in my appointments
|
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 |
Mohammad Aljammal
|
db79f299b6
|
ER
|
4 years ago |
Mohammad Aljammal
|
e254261ef9
|
ER
|
4 years ago |
Sultan Khan
|
f6a3f0e615
|
family file
|
4 years ago |
Mohammad Aljammal
|
02ce04a397
|
medical_profile_page.dart
|
4 years ago |
Mohammad Aljammal
|
e909c16b80
|
ER
|
4 years ago |
haroon amjad
|
3e5ef26b29
|
my appointment sorting implemented
|
4 years ago |
haroon amjad
|
ce9903fd13
|
nearest appointment flow implemented
|
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 |
Sultan Khan
|
20a17c0070
|
clinic search
|
4 years ago |
haroon amjad
|
1886f3a763
|
implementing Dental Appointment flow
|
4 years ago |
Sultan Khan
|
4a75215a19
|
search
|
4 years ago |
Sultan Khan
|
6b2f1a86df
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
Sultan Khan
|
3a4c016f4e
|
search
|
4 years ago |
Mohammad Aljammal
|
4ffbb80f3d
|
ER
|
4 years ago |
Mohammad Aljammal
|
5ec3935c68
|
ER
|
4 years ago |
Mohammad Aljammal
|
ef4a57223c
|
fix DoctorView.dart UI issues
|
4 years ago |
haroon amjad
|
a7f5dfab5c
|
fixes
|
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
|
e29c6a892e
|
updates
|
4 years ago |
haroon amjad
|
f669adcb9d
|
Location service implemented
|
4 years ago |
Sultan Khan
|
badb4e52df
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
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
|
d16ea676cf
|
done parking service ,fix design issues in home page and add new icon
|
4 years ago |
Mohammad Aljammal
|
01a011a03d
|
done dashboard page
|
4 years ago |
Sultan Khan
|
e7a3d1a4ab
|
speech search
|
4 years ago |
Sultan Khan
|
f52e73477a
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
Sultan Khan
|
f1e0bcf86e
|
speech to tex
|
4 years ago |
haroon amjad
|
84e92cb040
|
updates & fixes
|
4 years ago |
haroon amjad
|
96b7d00b4b
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
|
4 years ago |
haroon amjad
|
823eda0d5c
|
updates
|
4 years ago |
Mohammad Aljammal
|
4bc806671a
|
Merge branch 'amjad_amireh' into 'master'
filter doctor by department
See merge request Cloud_Solution/diplomatic-quarter!33
|
4 years ago |
Mohammad Aljammal
|
9e47dc19f9
|
filter doctor by department
|
4 years ago |
Sultan Khan
|
130fb53a65
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
Sultan Khan
|
3247378c02
|
search
|
4 years ago |
haroon amjad
|
30e08b4417
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
# lib/pages/login/login.dart
|
4 years ago |
haroon amjad
|
7a8392a97e
|
updates
|
4 years ago |
Mohammad Aljammal
|
c0c6376f55
|
filter doctor by department
|
4 years ago |
Mohammad Aljammal
|
dc9b9e21ad
|
filter doctor by department
|
4 years ago |
Mohammad Aljammal
|
895c09efa4
|
parking service
|
4 years ago |
Sultan Khan
|
1974e51602
|
merge
|
4 years ago |
Sultan Khan
|
5d112b5464
|
merge
|
4 years ago |
Sultan Khan
|
8516f7de1b
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
Sultan Khan
|
9b55309d53
|
text to speech
|
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 |
haroon amjad
|
61dba06236
|
Twilio implemented in LiveCare
|
4 years ago |
Sultan Khan
|
2f9885ecf8
|
family file changes
|
4 years ago |
Sultan Khan
|
8887ba85fe
|
family file
|
4 years ago |
haroon amjad
|
732ab90b2f
|
Book Appointment check login
|
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 |
haroon amjad
|
5f1413a2ac
|
implementing Twilio in LiveCare
|
4 years ago |
Mohammad Aljammal
|
9cf5c80aae
|
add time line and appointment rate
|
4 years ago |
Mohammad Aljammal
|
f5b16734c6
|
add time line
|
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 |
Mohammad Aljammal
|
75fdf28036
|
fix lab Result
|
4 years ago |
Mohammad Aljammal
|
8495260c5a
|
fix issues in feedback
|
4 years ago |
haroon amjad
|
db30fbdfd2
|
implementing livecare
|
4 years ago |
haroon amjad
|
59c279998c
|
working on vital signs integration
|
4 years ago |
Sultan Khan
|
47c42808fd
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
Sultan Khan
|
913729fc58
|
speech search
|
4 years ago |
Mohammad Aljammal
|
5619b8c06f
|
fix issues in feedback
|
4 years ago |
Mohammad Aljammal
|
2b0e35a907
|
fix issues in base app client
|
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 |
haroon amjad
|
b9d913e6a5
|
Merge fixes & updates
|
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 |
Sultan Khan
|
9afeecf9fa
|
new
|
4 years ago |
Mohammad Aljammal
|
32e2732c43
|
feedback service
|
4 years ago |
haroon amjad
|
3b881f1ab3
|
appointment details scenarios handled
|
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
|
206f9a4371
|
fixes
|
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
|
f229958e1c
|
add ions
|
4 years ago |
Mohammad Aljammal
|
22de043892
|
fix merge issues
|
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 |
Sultan Khan
|
3f0c60aea5
|
sessionID
|
4 years ago |
Mohammad Aljammal
|
a1fa2c0727
|
done vital sign
|
4 years ago |
Sultan Khan
|
da6f238c89
|
family files changes
|
4 years ago |
haroon amjad
|
c50530734d
|
added my appointments in medical file page
|
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
|
716482bc4d
|
Merge branch 'sultan' into 'master'
login changes
See merge request Cloud_Solution/diplomatic-quarter!17
|
4 years ago |
Mohammad Aljammal
|
5cee1cef4e
|
fix merge issues
|
4 years ago |
Sultan Khan
|
6af7ac54ba
|
login changes
|
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
|
125360ced7
|
fix merge issues
|
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
|
a84341af58
|
fix merge issues
|
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
|
7d230ea14c
|
fix issues
|
4 years ago |
Mohammad Aljammal
|
cfd5b2ccff
|
feedback Service done
|
4 years ago |
Sultan Khan
|
8e3fb6831d
|
registration changes
|
4 years ago |
Sultan Khan
|
e735855c33
|
registration done.
|
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 |
haroon amjad
|
192a3835d6
|
implemented payment method selection & payment details dialog. Added Calendar events to add remindar in calendar for appointment.
|
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
|
ec09721869
|
fix merge issues
|
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
|
93bfcbc20f
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into medical_profile
Conflicts:
lib/pages/landing/landing_page.dart
pubspec.yaml
|
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 |
Mohammad Aljammal
|
fc749de77e
|
create doctor card and medical page
|
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 |
Mohammad Aljammal
|
d02151bea8
|
fix import in main
|
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
|
d897463b42
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter
|
4 years ago |
Sultan Khan
|
4a0cc17069
|
login module started
|
4 years ago |
Mohammad Aljammal
|
198a1854a9
|
add documentation Mohammad Aljammal and Elham Rababah
|
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 |