hussam al-habibeh
|
6f914b3e93
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix-issues
Conflicts:
lib/screens/procedures/ProcedureCard.dart
lib/widgets/patients/profile/patient_profile_header_with_appointment_card_app_bar.dart
|
5 years ago |
hussam al-habibeh
|
3586d226e0
|
insurance approval & medical file design fix
|
5 years ago |
Mohammad Aljammal
|
f289ae0c44
|
Merge branch 'textfield-validation' into 'development'
Textfield validation
See merge request Cloud_Solution/doctor_app_flutter!475
|
5 years ago |
mosazaid
|
0e028c05f5
|
Merge branch 'development' into textfield-validation
|
5 years ago |
mosazaid
|
32e10269d4
|
add validation textfield
|
5 years ago |
Sultan Khan
|
0080b66c8e
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
32d1a19248
|
bug fixes
|
5 years ago |
Elham Rababah
|
9a8ca00eec
|
Merge branches 'Stepper_header' and 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into Stepper_header
Conflicts:
lib/widgets/patients/profile/soap_update/update_plan_page.dart
|
5 years ago |
Elham Rababah
|
6db35c8de9
|
return commented code
|
5 years ago |
Mohammad Aljammal
|
915cf74d3c
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services
Conflicts:
lib/screens/patients/profile/radiology/radiology_home_page.dart
|
5 years ago |
Mohammad Aljammal
|
8055fa17eb
|
add the branch in all doctors card and add no data image
|
5 years ago |
Mohammad Aljammal
|
e1c67ad8ce
|
Merge branch 'fix-issues' into 'development'
Fix issues
See merge request Cloud_Solution/doctor_app_flutter!471
|
5 years ago |
hussam al-habibeh
|
844bd9ba27
|
add lab & add radiology update
|
5 years ago |
mosazaid
|
3047b655cf
|
add Validation for customtextfield
|
5 years ago |
Elham Rababah
|
ff157b417e
|
fix add medication and soap index
|
5 years ago |
mosazaid
|
118cadd71b
|
Merge branch 'development' into soap-objective-feature-re-design
|
5 years ago |
mosazaid
|
fea6501b9e
|
design fixes issues
|
5 years ago |
Elham Rababah
|
9d4584097d
|
fix flag on slider
|
5 years ago |
Mohammad Aljammal
|
d0f5217c7c
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services
|
5 years ago |
hussam al-habibeh
|
8dca476898
|
add lab & add radiology design update
|
5 years ago |
mosazaid
|
25c3bf1bb1
|
Merge branch 'development' into soap-objective-feature-re-design
|
5 years ago |
mosazaid
|
0128144f83
|
working onm referral card and update on ucaf design
|
5 years ago |
Sultan Khan
|
90ad95bd63
|
login fixes
|
5 years ago |
Mohammad Aljammal
|
0dc6bbca34
|
finish the new design on the progress note (SOAP)
|
5 years ago |
Mohammad Aljammal
|
88d664776e
|
Merge branch 'fix-issues' into 'development'
add prescription & add lab test changes
See merge request Cloud_Solution/doctor_app_flutter!461
|
5 years ago |
Mohammad Aljammal
|
9839ef4a00
|
Merge branch 'soap-objective-feature-re-design' into 'development'
cahnges on UCaf
See merge request Cloud_Solution/doctor_app_flutter!460
|
5 years ago |
hussam al-habibeh
|
c72d612646
|
add prescription & add lab test changes
|
5 years ago |
Elham Rababah
|
eb5e5862ec
|
fix bugs
|
5 years ago |
Elham Rababah
|
3a7faf6b66
|
fix issues
|
5 years ago |
mosazaid
|
f017e4c280
|
cahnges on UCaf
|
5 years ago |
Mohammad Aljammal
|
c314bc7db7
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services
Conflicts:
lib/widgets/patients/profile/soap_update/update_soap_index.dart
|
5 years ago |
Mohammad Aljammal
|
c87f235cd2
|
fix the design issues
|
5 years ago |
Mohammad Aljammal
|
d105e0ef5d
|
fix the design issues
|
5 years ago |
Mohammad Aljammal
|
7fe7b9bd71
|
Merge branch 'development' into 'soap-objective-feature-re-design'
# Conflicts:
# lib/config/localized_values.dart
# lib/util/translations_delegate_base.dart
|
5 years ago |
Sultan Khan
|
c60e0dc54b
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
8654109500
|
login design updated
|
5 years ago |
mosazaid
|
f0f4613960
|
Merge branch 'development' into soap-objective-feature-re-design
|
5 years ago |
mosazaid
|
f8f088fe8c
|
design changes
|
5 years ago |
hussam al-habibeh
|
136c839c93
|
hot fixes
|
5 years ago |
Mohammad Aljammal
|
3449567086
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services
|
5 years ago |
hussam al-habibeh
|
b83c7835b9
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix-issues
Conflicts:
lib/widgets/patients/profile/soap_update/steps_widget.dart
|
5 years ago |
hussam al-habibeh
|
26672dbb6e
|
Radiology details & assessment fix
|
5 years ago |
Mohammad Aljammal
|
87560250bb
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services
|
5 years ago |
Mohammad Aljammal
|
c9b39a4154
|
Merge branch 'fix-issues' into 'development'
Procedure screen changes
See merge request Cloud_Solution/doctor_app_flutter!448
|
5 years ago |
Mohammad Aljammal
|
4bf9650b4f
|
fix the design issues
|
5 years ago |
hussam al-habibeh
|
f89eb0f76b
|
Procedure screen changes
|
5 years ago |
mosazaid
|
14b76c9302
|
Merge branch 'development' into soap-objective-feature-re-design
|
5 years ago |
mosazaid
|
b735a69a4f
|
bug fixes
|
5 years ago |
Sultan Khan
|
3ca9f33df4
|
bug fix
|
5 years ago |
Mohammad Aljammal
|
0e4ec6ed31
|
Merge branch 'sultan' into 'development'
Sultan
See merge request Cloud_Solution/doctor_app_flutter!443
|
5 years ago |
Sultan Khan
|
2aaeaa1a36
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
1fb594617a
|
bug fixes
|
5 years ago |
hussam al-habibeh
|
1fba6c839c
|
insurance approvals deatils fix
|
5 years ago |
hussam al-habibeh
|
11f2c30c64
|
Fix vist date im medical file
|
5 years ago |
Mohammad Aljammal
|
2fbf48e676
|
fix font size
|
5 years ago |
Mohammad Aljammal
|
63f64356cb
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services
|
5 years ago |
Sultan Khan
|
46daeac487
|
bug fix
|
5 years ago |
Mohammad Aljammal
|
0a00413639
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services
Conflicts:
lib/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart
|
5 years ago |
Sultan Khan
|
9aa42c71c2
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
bb29a1ac0f
|
patient arrival
|
5 years ago |
Mohammad Aljammal
|
a6f104c352
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services
Conflicts:
lib/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart
lib/widgets/patients/profile/patient_profile_header_with_appointment_card_app_bar.dart
|
5 years ago |
Mohammad Aljammal
|
ecccb2d068
|
fix font size
|
5 years ago |
Mohammad Aljammal
|
105ec683a4
|
Merge branch 'soap_new_design' into 'development'
Soap new design
See merge request Cloud_Solution/doctor_app_flutter!431
|
5 years ago |
Elham Rababah
|
2af1b6470a
|
remove commented code
|
5 years ago |
Mohammad Aljammal
|
4fe6652997
|
Merge branch 'patient_app_services' into 'development'
Patient app services
See merge request Cloud_Solution/doctor_app_flutter!430
|
5 years ago |
Elham Rababah
|
d8cce04b8a
|
fix replay design
|
5 years ago |
Mohammad Aljammal
|
c52866c596
|
Merge branch 'fix-issues' into 'development'
add new lab form small design fix
See merge request Cloud_Solution/doctor_app_flutter!429
|
5 years ago |
Elham Rababah
|
5f482663dd
|
fix the stepper
|
5 years ago |
hussam al-habibeh
|
83a98a3d58
|
add new lab form small design fix
|
5 years ago |
mosazaid
|
6006976040
|
Merge branch 'development' into patients-new-design
|
5 years ago |
mosazaid
|
93dba4cbeb
|
vital sign fix bug
|
5 years ago |
Mohammad Aljammal
|
be55597771
|
Merge branch 'fix-issues' into 'development'
adding Doctor image in medical file & adding DoctorApp new Icons
See merge request Cloud_Solution/doctor_app_flutter!426
|
5 years ago |
Mohammad Aljammal
|
6ca4797c91
|
hot fixes
|
5 years ago |
hussam al-habibeh
|
92d33abac0
|
adding Doctor image in medical file & adding DoctorApp new Icons
|
5 years ago |
mosazaid
|
f7235504fc
|
fixes
|
5 years ago |
mosazaid
|
ab514588e7
|
Merge branch 'development' into patients-new-design
|
5 years ago |
mosazaid
|
c900969496
|
design bugs
|
5 years ago |
Mohammad Aljammal
|
0ddc349eda
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services
Conflicts:
lib/widgets/shared/doctor_card_insurance.dart
|
5 years ago |
Mohammad Aljammal
|
e84dd573fe
|
fix the Procedure Card
|
5 years ago |
Mohammad Aljammal
|
98c33d550d
|
Merge branch 'fix-issues' into 'development'
insurance approvals design fix
See merge request Cloud_Solution/doctor_app_flutter!423
|
5 years ago |
hussam al-habibeh
|
6300d3f0fc
|
insurance approvals design fix
|
5 years ago |
Mohammad Aljammal
|
765554d5e1
|
Merge branch 'patients-new-design' into 'development'
Patients new design
See merge request Cloud_Solution/doctor_app_flutter!422
|
5 years ago |
Sultan Khan
|
66b81d1a27
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
5309ace62e
|
sick leave
|
5 years ago |
mosazaid
|
9dc708fd3d
|
Merge branch 'development' into patients-new-design
|
5 years ago |
mosazaid
|
494f716f05
|
working on new design on vital sign and referral screens
|
5 years ago |
Mohammad Aljammal
|
7f7f7611f3
|
Merge branch 'fix-issues' into 'development'
Fix issues
See merge request Cloud_Solution/doctor_app_flutter!419
|
5 years ago |
hussam al-habibeh
|
daa417a19b
|
Insurance approval new design
|
5 years ago |
Mohammad Aljammal
|
c7fdec144f
|
Merge branch 'doctor_replay' into 'development'
Doctor replay
See merge request Cloud_Solution/doctor_app_flutter!418
|
5 years ago |
Elham Rababah
|
fc98e75ec3
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into doctor_replay
Conflicts:
lib/config/localized_values.dart
|
5 years ago |
Elham Rababah
|
04f39315b5
|
finish doctor replay design
|
5 years ago |
Sultan Khan
|
bf32a3523e
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
6b9bf1d752
|
dashboard overflow change
|
5 years ago |
hussam al-habibeh
|
03f39b8bab
|
insurance approval new design
|
5 years ago |
Mohammad Aljammal
|
da370fc60a
|
change the font size in patient card, fix the Drawer issue and change the app name in android
|
5 years ago |
Mohammad Aljammal
|
3d8a118087
|
Merge branch 'patient_app_services' into 'development'
change the app icons
See merge request Cloud_Solution/doctor_app_flutter!415
|
5 years ago |
Mohammad Aljammal
|
17798247c7
|
change the app icons
|
5 years ago |
mosazaid
|
a454f434d1
|
hot fixes
|
5 years ago |
Mohammad Aljammal
|
0d1b8d5208
|
Merge branch 'fix-issues' into 'development'
small design fix in medical file
See merge request Cloud_Solution/doctor_app_flutter!412
|
5 years ago |
hussam al-habibeh
|
3baf4e2d55
|
small design fix in medical file
|
5 years ago |
Mohammad Aljammal
|
0562d7f3cb
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services
|
5 years ago |
Mohammad Aljammal
|
36ef342a75
|
Merge branch 'fix-issues' into 'development'
AppBar Design update&Design Fixes
See merge request Cloud_Solution/doctor_app_flutter!410
|
5 years ago |
hussam al-habibeh
|
5342d26c86
|
AppBar Design update&Design Fixes
|
5 years ago |
Mohammad Aljammal
|
2cda29a3e2
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services
|
5 years ago |
Mohammad Aljammal
|
c0bba0c21a
|
Merge branch 'patients-new-design' into 'development'
Patients new design
See merge request Cloud_Solution/doctor_app_flutter!409
|
5 years ago |
Mohammad Aljammal
|
3a8225e666
|
hot fix
|
5 years ago |
mosazaid
|
dd6e4f82cc
|
Merge branch 'development' into patients-new-design
|
5 years ago |
mosazaid
|
c642d88804
|
some fixes
|
5 years ago |
Sultan Khan
|
2a7ad6bfc8
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
cd10076b03
|
dashboard change
|
5 years ago |
Mohammad Aljammal
|
e978bd0df3
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services
|
5 years ago |
Mohammad Aljammal
|
16f285fa63
|
add the image dialog
|
5 years ago |
Mohammad Aljammal
|
4b1ace52ad
|
Merge branch 'patients-new-design' into 'development'
Patients new design
See merge request Cloud_Solution/doctor_app_flutter!407
|
5 years ago |
mosazaid
|
46fffe56b6
|
small changes
|
5 years ago |
hussam al-habibeh
|
b1ec91b20a
|
Design Fixes
|
5 years ago |
mosazaid
|
19ca735560
|
Merge branch 'development' into patients-new-design
|
5 years ago |
hussam al-habibeh
|
29029a7dea
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix-issues
|
5 years ago |
hussam al-habibeh
|
709c11d103
|
Design Fixes
|
5 years ago |
Mohammad Aljammal
|
6cd04996ec
|
hot fix
|
5 years ago |
mosazaid
|
914f15462f
|
Merge branch 'development' into patients-new-design
|
5 years ago |
mosazaid
|
cc7c5af1d0
|
referral details fix bugs
|
5 years ago |
Mohammad Aljammal
|
3fafa0ab01
|
add the patient cad as toolbar
|
5 years ago |
mosazaid
|
c73efe3681
|
Merge branch 'development' into patients-new-design
|
5 years ago |
hussam al-habibeh
|
ef2de6eb56
|
adding add procedure & update procedure forms
|
5 years ago |
mosazaid
|
caff27923b
|
Merge branch 'development' into patients-new-design
# Conflicts:
# lib/config/config.dart
|
5 years ago |
mosazaid
|
f57a5bbcef
|
working on referral page
|
5 years ago |
Mohammad Aljammal
|
e038ec4333
|
Merge branch 'patient_app_services' into 'development'
Create procedure card
See merge request Cloud_Solution/doctor_app_flutter!400
|
5 years ago |
Mohammad Aljammal
|
328bb25496
|
Create procedure card
|
5 years ago |
Sultan Khan
|
4ec8bcaa81
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
96daecee99
|
bug fix
|
5 years ago |
hussam al-habibeh
|
d1a6c2a703
|
adding add prescription form
|
5 years ago |
Mohammad Aljammal
|
34c0b0c119
|
Merge branch 'patients-new-design' into 'development'
finish Admission request new design
See merge request Cloud_Solution/doctor_app_flutter!394
|
5 years ago |
Mohammad Aljammal
|
7facc70a4c
|
Merge branch 'patient_app_services' into 'development'
Change the font type in the app and Prescription
See merge request Cloud_Solution/doctor_app_flutter!395
|
5 years ago |
Mohammad Aljammal
|
d45b8a9cc5
|
change the font type in the app and Prescription
|
5 years ago |
mosazaid
|
f280ed731d
|
finish Admission request new design
|
5 years ago |
Sultan Khan
|
c3f19d5ccf
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
5256c9633f
|
leave reschedule change
|
5 years ago |
Mohammad Aljammal
|
2bd505290d
|
fix design
|
5 years ago |
hussam al-habibeh
|
0f3f3f8f55
|
adding lab form and radiology
|
5 years ago |
hussam al-habibeh
|
2a1426ecd9
|
adding lab form and radiology
|
5 years ago |
Mohammad Aljammal
|
ba13ea7140
|
Merge branch 'patient_app_services' into 'development'
Patient app services
See merge request Cloud_Solution/doctor_app_flutter!389
|
5 years ago |
Mohammad Aljammal
|
920ec14bc2
|
add new design for Lab Result and Radiology Results
|
5 years ago |
Mohammad Aljammal
|
1068eea248
|
Merge branch 'patients-new-design' into 'development'
Patients new design
See merge request Cloud_Solution/doctor_app_flutter!387
|
5 years ago |
Mohammad Aljammal
|
5763970d23
|
Merge branch 'patient_app_services' into 'development'
Patient app services
See merge request Cloud_Solution/doctor_app_flutter!388
|
5 years ago |
mosazaid
|
1f70498982
|
Merge branch 'development' into patients-new-design
# Conflicts:
# lib/config/config.dart
|
5 years ago |
mosazaid
|
6eaf448d5a
|
working on new design for vital sign and admission request
|
5 years ago |
Mohammad Aljammal
|
6fbd2076d4
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services
|
5 years ago |
Mohammad Aljammal
|
83762fbd6e
|
change the lab result design
|
5 years ago |
Mohammad Aljammal
|
64f23187b6
|
Merge branch 'sultan' into 'development'
Sultan
See merge request Cloud_Solution/doctor_app_flutter!385
|
5 years ago |
Mohammad Aljammal
|
7c9163bc48
|
Merge branch 'fix-issues' into 'development'
Add Prescription Form New Design
See merge request Cloud_Solution/doctor_app_flutter!384
|
5 years ago |
Sultan Khan
|
9c111b07dd
|
design updates
|
5 years ago |
Sultan Khan
|
ee2e3fbbd6
|
sick leave
|
5 years ago |
hussam al-habibeh
|
672535fc94
|
add Lab Order Form & Radiology
|
5 years ago |
Sultan Khan
|
e14e004700
|
page updated
|
5 years ago |
hussam al-habibeh
|
e4bfdd198b
|
Add Prescription Form New Design
|
5 years ago |
Sultan Khan
|
3c1a65f310
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
eadfe2d6bc
|
bug fixes
|
5 years ago |
Mohammad Aljammal
|
2d1528e30e
|
Merge branch 'fix-issues' into 'development'
Fix issues
See merge request Cloud_Solution/doctor_app_flutter!381
|
5 years ago |
Mohammad Aljammal
|
747a0b7da4
|
change the lab result design
|
5 years ago |
hussam al-habibeh
|
79fe067fe2
|
Medical Report New Design
|
5 years ago |
Mohammad Aljammal
|
f0c65bb70b
|
change color and font for ESG service
|
5 years ago |
Mohammad Aljammal
|
cdf923803e
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services
|
5 years ago |
Mohammad Aljammal
|
019553ba51
|
new design for ESG service
|
5 years ago |
mosazaid
|
8237270e73
|
fix navigation problem to patient profile cards
|
5 years ago |
hussam al-habibeh
|
a1b0872cc1
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix-issues
|
5 years ago |
hussam al-habibeh
|
ebb130af09
|
Medical Report New Design
|
5 years ago |
mosazaid
|
c97b395810
|
send patient type to patient profile cards
|
5 years ago |
mosazaid
|
61a0e42afa
|
paient and referral screens new design
|
5 years ago |
hussam al-habibeh
|
db2c086ffd
|
Medical Report New Design
|
5 years ago |
Mohammad Aljammal
|
4877bc8f6d
|
Merge branch 'patient_app_services' into 'development'
hot fixes
See merge request Cloud_Solution/doctor_app_flutter!378
|
5 years ago |
Mohammad Aljammal
|
6267d805f0
|
hot fixes
|
5 years ago |
mosazaid
|
7117540a24
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patients-new-design
|
5 years ago |
mosazaid
|
27ff179750
|
working on referral screen bugs
|
5 years ago |
mosazaid
|
b3b2beef70
|
Merge branch 'refferal_card' into patients-new-design
|
5 years ago |
Sultan Khan
|
b19c3092a6
|
bug fixes
|
5 years ago |
mosazaid
|
ffd77528a2
|
patient profile new design
|
5 years ago |
Elham Rababah
|
4f558dc41d
|
fix referral card
|
5 years ago |
mosazaid
|
56f2b5f63a
|
Merge branch 'development' into patients-new-design
# Conflicts:
# lib/screens/patients/patients_screen.dart
# lib/widgets/patients/profile/profile_medical_info_widget.dart
|
5 years ago |
mosazaid
|
0e05b90c6b
|
finish patient profile screen
|
5 years ago |
Sultan Khan
|
a491eee7f7
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
e640bcf975
|
search updated
|
5 years ago |
Mohammad Aljammal
|
a167db7651
|
Fix prescription items
|
5 years ago |
Mohammad Aljammal
|
de48ae2bff
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services
Conflicts:
lib/config/config.dart
|
5 years ago |
Mohammad Aljammal
|
17f8b05748
|
Add prescriptions and radiology from the patient app
|
5 years ago |
Sultan Khan
|
091234ad77
|
bug fix
|
5 years ago |
mosazaid
|
69ff3450c4
|
Merge branch 'development' into patients-new-design
|
5 years ago |
mosazaid
|
96d285daa6
|
patient profile new design
|
5 years ago |
Sultan Khan
|
10ef8f7954
|
bug fixes
|
5 years ago |
Sultan Khan
|
5ca71f8fc0
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
12dc637163
|
bug fixes
|
5 years ago |
mosazaid
|
a13dd07734
|
Merge branch 'development' into patients-new-design
# Conflicts:
# pubspec.lock
|
5 years ago |
mosazaid
|
7702495e69
|
fix referral detail screen bug
|
5 years ago |
Mohammad Aljammal
|
7dae41513f
|
Add insurance approval services
|
5 years ago |
Mohammad Aljammal
|
e515265f11
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services
Conflicts:
lib/config/localized_values.dart
lib/util/translations_delegate_base.dart
|
5 years ago |
Mohammad Aljammal
|
0742d64428
|
add lab result services
|
5 years ago |
Sultan Khan
|
075ae0dcaa
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
5903fdd8b8
|
tab bar changes
|
5 years ago |
Elham Rababah
|
d0d8d81ae4
|
fix small issue in on search
|
5 years ago |
Elham Rababah
|
103a1bc6fc
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into clinic_list
Conflicts:
lib/config/localized_values.dart
lib/screens/medicine/medicine_search_screen.dart
lib/util/translations_delegate_base.dart
|
5 years ago |
Mohammad Aljammal
|
770767ebb6
|
Merge branch 'sultan' into 'development'
Sultan
See merge request Cloud_Solution/doctor_app_flutter!361
|
5 years ago |
Sultan Khan
|
93caeb3876
|
search screen updated
|
5 years ago |
Sultan Khan
|
bbb1a8ff74
|
arrival list updated
|
5 years ago |
Elham Rababah
|
96d07e7a59
|
fix small issue in radiology
|
5 years ago |
Elham Rababah
|
7ebf36f98f
|
add radiology open image
|
5 years ago |
hussam al-habibeh
|
06fdee2d2d
|
hussam
|
5 years ago |
Elham Rababah
|
234cc57a2a
|
return search medicine
|
5 years ago |
Sultan Khan
|
4d4d3b460d
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
27bbb9ac59
|
changes updated
|
5 years ago |
Mohammad Aljammal
|
6b28f294d6
|
Merge branch 'clinic_list' into 'development'
hot fix with search
See merge request Cloud_Solution/doctor_app_flutter!356
|
5 years ago |
Elham Rababah
|
8a332b4d83
|
hot fix with search
|
5 years ago |
Sultan Khan
|
94f0a7a448
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
5861d159ac
|
bug fixes
|
5 years ago |
Elham Rababah
|
51c6329517
|
return back my code
|
5 years ago |
Elham Rababah
|
e7d1a6c805
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into clinic_list
Conflicts:
lib/screens/patients/patients_screen.dart
|
5 years ago |
Mohammad Aljammal
|
22fc45ce16
|
Merge branch 'ecg_services' into 'development'
Ecg services
See merge request Cloud_Solution/doctor_app_flutter!353
|
5 years ago |
Mohammad Aljammal
|
1af6115365
|
add ECG and Show sick leave
|
5 years ago |
Elham Rababah
|
42666e2200
|
move clinic list to its own file
|
5 years ago |
Sultan Khan
|
704d2484cf
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Mohammad Aljammal
|
ee25102c2d
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into ecg_services
Conflicts:
lib/screens/patients/profile/patient_profile_screen.dart
lib/widgets/patients/profile/profile_medical_info_widget.dart
|
5 years ago |
Mohammad Aljammal
|
e7e4aad962
|
add ECG service
|
5 years ago |
Sultan Khan
|
cf7d494944
|
search pages and dashboard updated
|
5 years ago |
Elham Rababah
|
e2e92c1c59
|
Clinic List widget
|
5 years ago |
hussam al-habibeh
|
15774e5b05
|
hussam
|
5 years ago |
Elham Rababah
|
64c7dae97c
|
Merge branches 'development' and 'patinet_profile_with_all_service' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patinet_profile_with_all_service
Conflicts:
lib/screens/patients/patients_screen.dart
|
5 years ago |
Elham Rababah
|
a40bec844b
|
Merge branches 'development' and 'patinet_profile_with_all_service' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patinet_profile_with_all_service
Conflicts:
lib/screens/patients/patients_screen.dart
|
5 years ago |
Elham Rababah
|
340bfd0a1c
|
add clinic to arrival search patient
|
5 years ago |
mosazaid
|
6c46e21031
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
# Conflicts:
# lib/screens/dashboard_screen.dart
# lib/screens/patients/patients_screen.dart
|
5 years ago |
mosazaid
|
92e60bd3fd
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
# Conflicts:
# lib/screens/dashboard_screen.dart
# lib/screens/patients/patients_screen.dart
|
5 years ago |
mosazaid
|
fdc893c3d6
|
make search patient profile have preview services
|
5 years ago |
Sultan Khan
|
a8ef4a98a5
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
376653a344
|
dashboard changes
|
5 years ago |
hussam al-habibeh
|
983f03108f
|
adding prescription history & Medical file for all patient types
|
5 years ago |
Mohammad Aljammal
|
893fc05449
|
Merge branch 'patinet_profile_with_all_service' into 'development'
Patinet profile with all service
See merge request Cloud_Solution/doctor_app_flutter!345
|
5 years ago |
Elham Rababah
|
a329c447a2
|
fix allergic in header
|
5 years ago |
Mohammad Aljammal
|
982e075e41
|
Merge branch 'app_changes' into 'development'
App changes
See merge request Cloud_Solution/doctor_app_flutter!344
|
5 years ago |
mosazaid
|
7c5d88f169
|
Merge branch 'development' into app_changes
|
5 years ago |
mosazaid
|
9b02bdc541
|
inhancements
|
5 years ago |
Sultan Khan
|
8039460a38
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
1536632cd4
|
dashboard updated
|
5 years ago |
Mohammad Aljammal
|
929a515a7c
|
Merge branch 'fix-issues' into 'development'
Medical Report & update Prescription form update
See merge request Cloud_Solution/doctor_app_flutter!342
|
5 years ago |
hussam al-habibeh
|
bcf25d7b95
|
Medical Report & update Prescription form update
|
5 years ago |
Sultan Khan
|
3f7961b50c
|
dashboard sreen updated
|
5 years ago |
Sultan Khan
|
05ef7a4b25
|
dashboard page updated
|
5 years ago |
Mohammad Aljammal
|
c00d4107b9
|
Merge branch 'fix-issues' into 'development'
hussam
See merge request Cloud_Solution/doctor_app_flutter!339
|
5 years ago |
hussam al-habibeh
|
53d22a8d6d
|
hussam
|
5 years ago |
Mohammad Aljammal
|
7f91978d29
|
Merge branch 'sultan' into 'development'
Sultan
See merge request Cloud_Solution/doctor_app_flutter!338
|
5 years ago |
hussam al-habibeh
|
d099ac9b57
|
hussam
|
5 years ago |
hussam al-habibeh
|
0597cc4b00
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix-issues
Conflicts:
lib/core/model/get_medication_response_model.dart
lib/core/service/prescription_service.dart
|
5 years ago |
hussam al-habibeh
|
b64a388a1d
|
update procedure without entering any data
|
5 years ago |
Sultan Khan
|
be832bfd4b
|
dashboard design
|
5 years ago |
hussam al-habibeh
|
8d8aa78ccb
|
Claculate Box Quantity while adding prescrption
|
5 years ago |
hussam al-habibeh
|
aa7b18dbb0
|
Claculate Box Quantity while adding prescrption
|
5 years ago |
hussam al-habibeh
|
c239dbc620
|
Claculate Box Quantity while adding prescrption
|
5 years ago |
Sultan Khan
|
817718f897
|
drug to drug intraction
|
5 years ago |
Sultan Khan
|
12f936d045
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
531e7f497b
|
drug to drug intraction
|
5 years ago |
Mohammad Aljammal
|
780599a8b2
|
Merge branch 'fix-issues' into 'development'
categories that can update
See merge request Cloud_Solution/doctor_app_flutter!335
|
5 years ago |
hussam al-habibeh
|
0411462360
|
update procedure for agreed categorise
|
5 years ago |
hussam al-habibeh
|
46b5f2a5f3
|
update procedure for agreed categories
|
5 years ago |
hussam al-habibeh
|
b00b739e79
|
categories that can update
|
5 years ago |
Mohammad Aljammal
|
68dc39eb94
|
Merge branch 'fix-issues' into 'development'
Procedure update valdation
See merge request Cloud_Solution/doctor_app_flutter!334
|
5 years ago |
hussam al-habibeh
|
24d13b06c5
|
Procedure update valdation
|
5 years ago |
Mohammad Aljammal
|
5a4b084446
|
Merge branch 'fix-issues' into 'development'
procedure updates
See merge request Cloud_Solution/doctor_app_flutter!333
|
5 years ago |
hussam al-habibeh
|
6ae8cf8048
|
procedure updates
|
5 years ago |
Mohammad Aljammal
|
3a703da5d5
|
Merge branch 'fix-issues' into 'development'
Prescription update filters
See merge request Cloud_Solution/doctor_app_flutter!332
|
5 years ago |
hussam al-habibeh
|
4e01bcb758
|
Prescription update filters
|
5 years ago |
Mohammad Aljammal
|
4235ecda81
|
Merge branch 'fix-issues' into 'development'
update prescription
See merge request Cloud_Solution/doctor_app_flutter!331
|
5 years ago |
hussam al-habibeh
|
8aeb749596
|
prescription update
|
5 years ago |
hussam al-habibeh
|
7063e924de
|
update prescription
|
5 years ago |
Mohammad Aljammal
|
6f46e89346
|
Merge branch 'fix-issues' into 'development'
DA-185
See merge request Cloud_Solution/doctor_app_flutter!330
|
5 years ago |
hussam al-habibeh
|
bfe73ebe1d
|
DA-185
|
5 years ago |
Mohammad Aljammal
|
e03d2c6ab6
|
Merge branch 'fix-issues' into 'development'
jira bug
See merge request Cloud_Solution/doctor_app_flutter!329
|
5 years ago |
hussam al-habibeh
|
dc941b709f
|
DA-396
|
5 years ago |
hussam al-habibeh
|
eb88bea880
|
jira bug
|
5 years ago |
Mohammad Aljammal
|
88a5750d22
|
Merge branch 'fix-issues' into 'development'
jira bugs fix
See merge request Cloud_Solution/doctor_app_flutter!327
|
5 years ago |
hussam al-habibeh
|
066ac94d4a
|
jira bugs
|
5 years ago |
hussam al-habibeh
|
3250f33b43
|
jira bugs fix
|
5 years ago |
Sultan Khan
|
332caaae2f
|
dashboard issue
|
5 years ago |
Mohammad Aljammal
|
9ffe1eabd2
|
revert the code
|
5 years ago |
Mohammad Aljammal
|
63db56a66b
|
fix issue
|
5 years ago |
Elham Rababah
|
8238e9569a
|
fix DA-391: return back my comment code in dashboard
|
5 years ago |
Elham Rababah
|
219ab8d4ac
|
fix DA-391
|
5 years ago |
Elham Rababah
|
8615671095
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into add_medication_details
Conflicts:
lib/util/translations_delegate_base.dart
|
5 years ago |
Elham Rababah
|
f3220be735
|
fix DA-350
|
5 years ago |
Mohammad Aljammal
|
68462b04d8
|
Merge branch 'fix-issues' into 'development'
updating prescription after backend fix
See merge request Cloud_Solution/doctor_app_flutter!321
|
5 years ago |
hussam al-habibeh
|
f32d25b007
|
updating prescription after backend fix
|
5 years ago |
Sultan Khan
|
449540504c
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
214dfecb3c
|
DA-422
|
5 years ago |
Mohammad Aljammal
|
3c090ecdaf
|
Merge branch 'fix-issues' into 'development'
design inhancment
See merge request Cloud_Solution/doctor_app_flutter!319
|
5 years ago |
hussam al-habibeh
|
ae17998e0a
|
Design inhancment
|
5 years ago |
hussam al-habibeh
|
54ad8bde0b
|
design inhancment
|
5 years ago |
Mohammad Aljammal
|
1424941f94
|
Merge branch 'fix-issues' into 'development'
new changes
See merge request Cloud_Solution/doctor_app_flutter!317
|
5 years ago |
Sultan Khan
|
8c6a29669a
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
9ed5a294ab
|
dashboard changes
|
5 years ago |
hussam al-habibeh
|
2ee2429c70
|
Date Formate change
|
5 years ago |
hussam al-habibeh
|
57aea2ba4f
|
pharmacy remarks
|
5 years ago |
hussam al-habibeh
|
963fe42cd8
|
new changes
|
5 years ago |
Mohammad Aljammal
|
98bc5f7812
|
Merge branch 'fix-issues' into 'development'
DA-355
See merge request Cloud_Solution/doctor_app_flutter!316
|
5 years ago |
hussam al-habibeh
|
d115564cc1
|
DA-355
|
5 years ago |
Sultan Khan
|
6bdd4e06a1
|
dashboard changes
|
5 years ago |
Sultan Khan
|
388c095d7f
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
a309acbf46
|
dashboard changes
|
5 years ago |
Mohammad Aljammal
|
cd6a31f0d5
|
Merge branch 'fix_issue_feb' into 'development'
Fix issue feb
See merge request Cloud_Solution/doctor_app_flutter!314
|
5 years ago |
hussam al-habibeh
|
2563b10216
|
DA-367
|
5 years ago |
Elham Rababah
|
07edbc4fe5
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_issue_feb
|
5 years ago |
Elham Rababah
|
344d70793c
|
fix DA-421
|
5 years ago |
hussam al-habibeh
|
cb8b7a4ec4
|
jira bug fixing
|
5 years ago |
hussam al-habibeh
|
925d21f29a
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix-issues
Conflicts:
lib/screens/prescription/update_prescription_form.dart
|
5 years ago |
hussam al-habibeh
|
39d2fe879c
|
jira bug fixing
|
5 years ago |
Mohammad Aljammal
|
21ead3b219
|
Merge branch 'referral-facilities-changes' into 'development'
add referral get facilties
See merge request Cloud_Solution/doctor_app_flutter!310
|
5 years ago |
Mohammad Aljammal
|
d8d2e7f1d6
|
fix ios issues
|
5 years ago |
mosazaid
|
a047255f2c
|
add referral get facilties
|
5 years ago |
hussam al-habibeh
|
d20e83faa5
|
bug fixing
|
5 years ago |
hussam al-habibeh
|
8bf578082b
|
bug fixing
|
5 years ago |
hussam al-habibeh
|
bd69219a86
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix-issues
Conflicts:
lib/screens/prescription/add_prescription_form.dart
|
5 years ago |
hussam al-habibeh
|
cd94b835b5
|
bug fixing
|
5 years ago |
Sultan Khan
|
fa80d62e7d
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
0dc25a4a03
|
bug fixes
|
5 years ago |
Mohammad Aljammal
|
60e416e632
|
add done button in all pages user keyboard and hide the keyboard when the user click on background
|
5 years ago |
hussam al-habibeh
|
28370e7492
|
fix bugs
|
5 years ago |
hussam al-habibeh
|
255f36598b
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix-issues
|
5 years ago |
hussam al-habibeh
|
d4ea901906
|
bugs fix
|
5 years ago |
Mohammad Aljammal
|
8deba06957
|
Merge branch 'fix_patient_card' into 'development'
fix PatientCard
See merge request Cloud_Solution/doctor_app_flutter!304
|
5 years ago |
Mohammad Aljammal
|
bf747d5427
|
Merge branch 'fix-issues' into 'development'
bug fixing
See merge request Cloud_Solution/doctor_app_flutter!302
|
5 years ago |
Elham Rababah
|
c8e5a7eeef
|
fix PatientCard
|
5 years ago |
mosazaid
|
4f302694b3
|
Merge branch 'development' into fix-bugs10_2
|
5 years ago |
mosazaid
|
498c6c00af
|
fix minor issue bugs (DA-273, DA-361, DA-362, DA-363)
|
5 years ago |
hussam al-habibeh
|
3d60813146
|
bug fixing
|
5 years ago |
Mohammad Aljammal
|
d41fd496b6
|
Merge branch 'fix-issues' into 'development'
fixing bugs
See merge request Cloud_Solution/doctor_app_flutter!300
|
5 years ago |
Sultan Khan
|
f0539860c2
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
400f8e25f6
|
bug xis
|
5 years ago |
hussam al-habibeh
|
5bde14813a
|
fixing bugs
|
5 years ago |
mosazaid
|
87f67ea2e8
|
DA-273 solve
|
5 years ago |
mosazaid
|
1207339b01
|
Merge branch 'development' into admission-request
|
5 years ago |
mosazaid
|
8d154239bb
|
finish admission request feature
|
5 years ago |
Elham Rababah
|
a1c60e692f
|
Merge branches 'development' and 'fix_issues' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_issues
Conflicts:
lib/config/localized_values.dart
|
5 years ago |
Mohammad Aljammal
|
2f877b6257
|
Merge branch 'DA-284-DA-285' into 'development'
bug fixes for DA-284-DA-285
See merge request Cloud_Solution/doctor_app_flutter!297
|
5 years ago |
Elham Rababah
|
248367fbe9
|
fix DA-220
|
5 years ago |
mosazaid
|
a618292d20
|
bug fixes for DA-284-DA-285
|
5 years ago |
Mohammad Aljammal
|
2e19af335e
|
Merge branch 'feature-ucaf' into 'development'
Feature ucaf
See merge request Cloud_Solution/doctor_app_flutter!296
|
5 years ago |
Mohammad Aljammal
|
63878281b3
|
Merge branch 'sultan' into 'development'
Sultan
See merge request Cloud_Solution/doctor_app_flutter!295
|
5 years ago |
Mohammad Aljammal
|
0c6ba54680
|
Merge branch 'fix-issues' into 'development'
jira bugs fix
See merge request Cloud_Solution/doctor_app_flutter!294
|
5 years ago |
mosazaid
|
f87f851100
|
Merge branch 'development' into feature-ucaf
# Conflicts:
# lib/core/service/base/lookup-service.dart
# lib/util/translations_delegate_base.dart
|
5 years ago |
mosazaid
|
2b3a7f33d1
|
working on some bug fixes and finish addmission request
|
5 years ago |
hussam al-habibeh
|
9ec78763dc
|
update prescription
|
5 years ago |
hussam al-habibeh
|
539f7facc7
|
jira bugs fix
|
5 years ago |
Mohammad Aljammal
|
05ed1202fe
|
Merge branch 'fix_issues' into 'development'
Fix issues
See merge request Cloud_Solution/doctor_app_flutter!293
|
5 years ago |
Mohammad Aljammal
|
127b5eb4bd
|
Merge branch 'fix-issues' into 'development'
fix bugs
See merge request Cloud_Solution/doctor_app_flutter!292
|
5 years ago |
Sultan Khan
|
efc4cf9443
|
reschedule issue fixed
|
5 years ago |
Elham Rababah
|
1e84b73cf0
|
fix DA-279
|
5 years ago |
Elham Rababah
|
34d5ac7d43
|
add label on assessment and fix DA-333
|
5 years ago |
hussam al-habibeh
|
6dd1d9ef90
|
fix bugs
|
5 years ago |
Sultan Khan
|
8b7acf7202
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
6a23c2a137
|
bug fix
|
5 years ago |
Mohammad Aljammal
|
9f04ef8066
|
Merge branch 'fix_issues' into 'development'
Fix issues
See merge request Cloud_Solution/doctor_app_flutter!290
|
5 years ago |
hussam al-habibeh
|
546b520d7b
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix-issues
Conflicts:
lib/core/enum/master_lookup_key.dart
lib/core/service/base/lookup-service.dart
|
5 years ago |
hussam al-habibeh
|
15dd0f7c1a
|
bug fix
|
5 years ago |
hussam al-habibeh
|
d66811546f
|
refactoring my code
|
5 years ago |
mosazaid
|
a71bf160e7
|
Merge branch 'development' into feature-ucaf
|
5 years ago |
mosazaid
|
5b5954c6f3
|
working on Admission request feature adding lookup
|
5 years ago |
hussam al-habibeh
|
23c826b37f
|
bug fix
|
5 years ago |
Elham Rababah
|
f84902b73b
|
fix : DA-333
|
5 years ago |
Mohammad Aljammal
|
8916b4a1f3
|
Merge branch 'fix-issues' into 'development'
Fix issues
See merge request Cloud_Solution/doctor_app_flutter!286
|
5 years ago |
hussam al-habibeh
|
29de472c66
|
bug fix
|
5 years ago |
hussam al-habibeh
|
9b5899d4e6
|
bug fix
|
5 years ago |
hussam al-habibeh
|
deca96f62e
|
bug fix
|
5 years ago |
mosazaid
|
de1d0283d2
|
some lables and translation changes and add search functionality for ListSelectDialog
|
5 years ago |
hussam al-habibeh
|
b267342c03
|
fixing issues
|
5 years ago |
mosazaid
|
a64088320f
|
DA-259 translation bug
|
5 years ago |
mosazaid
|
c2df291029
|
DA - 286 Fix
|
5 years ago |
Mohammad Aljammal
|
cb767e4d4c
|
Merge branch 'fix-issues' into 'development'
bugs fix
See merge request Cloud_Solution/doctor_app_flutter!282
|
5 years ago |
hussam al-habibeh
|
6b0e87ce55
|
bugs fix
|
5 years ago |
Mohammad Aljammal
|
6253e2c9a3
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_ios
Conflicts:
lib/util/translations_delegate_base.dart
|
5 years ago |
Mohammad Aljammal
|
75efcde0bc
|
fix ios
|
5 years ago |
mosazaid
|
2273808333
|
translation
|
5 years ago |
mosazaid
|
cca4e33fce
|
Merge branch 'development' into feature-ucaf
# Conflicts:
# lib/config/localized_values.dart
# lib/util/translations_delegate_base.dart
|
5 years ago |
mosazaid
|
ebc5ba7743
|
some fixes
|
5 years ago |
Elham Rababah
|
7db8a42adc
|
Merge branches 'development' and 'fix_issues' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_issues
Conflicts:
lib/config/localized_values.dart
lib/util/translations_delegate_base.dart
|
5 years ago |
Mohammad Aljammal
|
6d473be371
|
Merge branch 'feature-ucaf' into 'development'
Feature ucaf
See merge request Cloud_Solution/doctor_app_flutter!273
|
5 years ago |
hussam al-habibeh
|
35bc8c03a4
|
bug fixing
|
5 years ago |
mosazaid
|
e75318799f
|
Merge branch 'development' into feature-ucaf
|
5 years ago |
mosazaid
|
ac9fd8c936
|
samll fixes for labels and msges
|
5 years ago |
Elham Rababah
|
fd17fc4608
|
enforce user to add date in case referral
|
5 years ago |
Elham Rababah
|
905818b532
|
add admission no to orders
|
5 years ago |
Elham Rababah
|
b9eaee1887
|
fix design
|
5 years ago |
Elham Rababah
|
13c879654b
|
DA-250: fix age
|
5 years ago |
Mohammad Aljammal
|
81fdcb2d8d
|
Merge branch 'fix_issues' into 'development'
Fix issues
See merge request Cloud_Solution/doctor_app_flutter!271
|
5 years ago |
Mohammad Aljammal
|
fbd509d6ec
|
Merge branch 'fix-issues' into 'development'
bugs fix
See merge request Cloud_Solution/doctor_app_flutter!272
|
5 years ago |
hussam al-habibeh
|
fb8381ea61
|
bugs fix
|
5 years ago |
Elham Rababah
|
68d27a451d
|
fix general issue
|
5 years ago |
Elham Rababah
|
a5bccddf55
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_issues
|
5 years ago |
Elham Rababah
|
9ddfbd3e66
|
fix issue on app drawer
|
5 years ago |
Sultan Khan
|
d5d7ea6c49
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
63e8ee8dd0
|
sick leave
|
5 years ago |
hussam alhababieh
|
3c55af7adc
|
Merge branch 'development' into 'tasks-translation'
# Conflicts:
# lib/screens/prescription/add_prescription_form.dart
|
5 years ago |
hussam al-habibeh
|
7c800bdab4
|
medical file fix
|
5 years ago |
Elham Rababah
|
00543a759a
|
fix remarks in allergies
|
5 years ago |
Elham Rababah
|
8c9ffc2e62
|
fix multiple issue
|
5 years ago |
Elham Rababah
|
cbf850da2f
|
fix DA-201
|
5 years ago |
Mohammad Aljammal
|
35a9f34b18
|
Merge branch 'development' into 'sultan'
# Conflicts:
# lib/widgets/patients/profile/profile_medical_info_widget.dart
|
5 years ago |
Sultan Khan
|
135c852e8c
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
735698ce90
|
bug fixes
|
5 years ago |
hussam al-habibeh
|
bada160cf5
|
Search Medacation
|
5 years ago |
hussam al-habibeh
|
d9fcf89c19
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into tasks-translation
Conflicts:
lib/core/viewModel/medicine_view_model.dart
|
5 years ago |
hussam al-habibeh
|
4a4cd03f63
|
Prescription date
|
5 years ago |
Elham Rababah
|
537f53c3de
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_issues
Conflicts:
lib/config/localized_values.dart
lib/util/translations_delegate_base.dart
|
5 years ago |
Elham Rababah
|
ba263ada44
|
fix DA-201
|
5 years ago |
hussam al-habibeh
|
ced4edebde
|
patinet profile update
|
5 years ago |
Elham Rababah
|
53e88620ec
|
fix DA-230
|
5 years ago |
Sultan Khan
|
d55ce4c1ec
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Mohammad Aljammal
|
5af6210785
|
Merge branch 'feature-ucaf' into 'development'
Feature ucaf
See merge request Cloud_Solution/doctor_app_flutter!263
|
5 years ago |
Mohammad Aljammal
|
574e1525d9
|
Merge branch 'tasks-translation' into 'development'
Prescription & medical file fix
See merge request Cloud_Solution/doctor_app_flutter!262
|
5 years ago |
mosazaid
|
cd95a581f0
|
simple changes
|
5 years ago |
Sultan Khan
|
896078507f
|
gub fixes
|
5 years ago |
hussam al-habibeh
|
e133a014e8
|
Prescription & medical file fix
|
5 years ago |
Elham Rababah
|
e32c360f85
|
fix DA-154,DA-150
|
5 years ago |
mosazaid
|
e808d48035
|
Merge branch 'development' into feature-ucaf
# Conflicts:
# lib/config/localized_values.dart
# lib/util/translations_delegate_base.dart
|
5 years ago |
mosazaid
|
88f1dc637f
|
some fixes
|
5 years ago |
Elham Rababah
|
8360179050
|
fix DA-195
|
5 years ago |
Elham Rababah
|
c11f195e72
|
fix DA-192
|
5 years ago |
Elham Rababah
|
d53493aa52
|
fix DA-237
|
5 years ago |
Elham Rababah
|
c6156921e8
|
fix DA-197
|
5 years ago |
Elham Rababah
|
4a3175830d
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_loader
Conflicts:
lib/config/localized_values.dart
lib/screens/dashboard_screen.dart
lib/util/translations_delegate_base.dart
|
5 years ago |
Sultan Khan
|
417ca9401b
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
a99b3847ac
|
login completed
|
5 years ago |
Elham Rababah
|
763d6bb49f
|
finish add loader
|
5 years ago |
hussam al-habibeh
|
5150f9b93d
|
Prescription & procedure body update
|
5 years ago |
Elham Rababah
|
bc8a90ef2c
|
first step from fix loader
|
5 years ago |
Mohammad Aljammal
|
f75ab83981
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referralPatient
Conflicts:
lib/config/localized_values.dart
lib/widgets/patients/profile/profile_medical_info_widget.dart
|
5 years ago |
Mohammad Aljammal
|
9147cde86e
|
Merge branch 'tasks-translation' into 'development'
medical dile & Order Procedure translation
See merge request Cloud_Solution/doctor_app_flutter!256
|
5 years ago |
hussam al-habibeh
|
015c3b53c8
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into tasks-translation
Conflicts:
lib/config/localized_values.dart
lib/util/translations_delegate_base.dart
lib/widgets/patients/profile/profile_medical_info_widget.dart
|
5 years ago |
hussam al-habibeh
|
e67233bb21
|
medical dile & Order Procedure translation
|
5 years ago |
mosazaid
|
eae0bb443f
|
solve problem with vital signs charts depend on date
|
5 years ago |
mosazaid
|
d9d4e22531
|
Merge branch 'development' into feature-ucaf
|
5 years ago |
mosazaid
|
dcb71e5c22
|
Add charts to patient vital signs feature
&
Merge branch 'development' into feature-ucaf
# Conflicts:
# lib/util/translations_delegate_base.dart
# pubspec.yaml
|
5 years ago |
hussam alhababieh
|
d87aeb290f
|
Merge branch 'development' into 'procedure-fix'
# Conflicts:
# lib/landing_page.dart
|
5 years ago |
hussam al-habibeh
|
b0410dc744
|
Procedure updates
|
5 years ago |
hussam al-habibeh
|
debcad3a3d
|
prescription
|
5 years ago |
hussam al-habibeh
|
4b54ca7d47
|
prescription
|
5 years ago |
Elham Rababah
|
23fb2e7297
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referralPatient
Conflicts:
lib/config/localized_values.dart
lib/util/translations_delegate_base.dart
|
5 years ago |
Elham Rababah
|
6bab2e0b2d
|
fix referral patient issue
|
5 years ago |
mosazaid
|
8424e92c4b
|
working on vital Sign feature with Charts
|
5 years ago |
Sultan Khan
|
722e1a5c41
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
ad99cebf02
|
login and drug to drug
|
5 years ago |
Mohammad Aljammal
|
307463865b
|
Merge branch 'feature-ucaf' into 'development'
Feature ucaf
See merge request Cloud_Solution/doctor_app_flutter!249
|
5 years ago |
Mohammad Aljammal
|
3306d6f400
|
Merge branch 'medical-file' into 'development'
post Procedure
See merge request Cloud_Solution/doctor_app_flutter!248
|
5 years ago |
hussam al-habibeh
|
dd53a9bd4d
|
post Procedure
|
5 years ago |
mosazaid
|
8726653ffb
|
working on Referral feature
|
5 years ago |
Sultan Khan
|
909940a6d9
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
40e9ab864a
|
login changes
|
5 years ago |
mosazaid
|
2f17167e2f
|
some design enhancments
|
5 years ago |
Mohammad Aljammal
|
21114fc88f
|
Merge branch 'development' into 'feature-ucaf'
# Conflicts:
# lib/config/localized_values.dart
# lib/util/translations_delegate_base.dart
|
5 years ago |
Mohammad Aljammal
|
70cfc4668b
|
Merge branch 'medical-file' into 'development'
Medical file
See merge request Cloud_Solution/doctor_app_flutter!243
|
5 years ago |
Elham
|
9e7a7210c4
|
Merge branch 'soap_update' into 'development'
Soap update
See merge request Cloud_Solution/doctor_app_flutter!244
|
5 years ago |
Elham Rababah
|
fb035cd4c9
|
fix patient_search_screen.dart
|
5 years ago |
hussam al-habibeh
|
5253c28469
|
prescription form fix
|
5 years ago |
Elham Rababah
|
4f1a892be4
|
first step form create episode
|
5 years ago |
mosazaid
|
289cf9b479
|
Merge branch 'development' into feature-ucaf
|
5 years ago |
Mohammad Aljammal
|
e60cc5ec4a
|
Merge branch 'medical-file' into 'development'
Medical file
See merge request Cloud_Solution/doctor_app_flutter!240
|
5 years ago |
mosazaid
|
fd2a86dca4
|
some changes in patientArrivalList And make action when click on vitalSign widget inside pendingReferral
|
5 years ago |
hussam al-habibeh
|
f767467a67
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into medical-file
|
5 years ago |
hussam al-habibeh
|
bcbd091dae
|
ss
|
5 years ago |
hussam al-habibeh
|
a3fa8ef839
|
medical file fix
|
5 years ago |
mosazaid
|
ff906338bf
|
Merge branch 'development' into feature-ucaf
|
5 years ago |
mosazaid
|
9a5cafaaf5
|
working on UCAF detail screen , and some cahgnes on referral list
|
5 years ago |
mosazaid
|
e14df2855a
|
Merge branch 'development' into feature-ucaf
|
5 years ago |
mosazaid
|
50d7f733b6
|
working on UCAF datails and add patient procedure list and diagnosis
|
5 years ago |
Sultan Khan
|
71c4d48cca
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
c4cae6fb38
|
doctor leave bug fix
|
5 years ago |
Mohammad Aljammal
|
eb5a3a59ff
|
hot fixing
|
5 years ago |
Sultan Khan
|
87d90a394b
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
044ad7b51a
|
offtime leave
|
5 years ago |
mosazaid
|
b67fd55aac
|
Merge branch 'development' into feature-ucaf
|
5 years ago |
mosazaid
|
e75e7801aa
|
working on UCAF get data
|
5 years ago |
Mohammad Aljammal
|
d7b8e29455
|
Merge branch 'medical-file' into 'development'
drug list
See merge request Cloud_Solution/doctor_app_flutter!234
|
5 years ago |
hussam al-habibeh
|
f997561bb8
|
drug list
|
5 years ago |
Mohammad Aljammal
|
699c565427
|
Merge branch 'feature-ucaf' into 'development'
Feature ucaf
See merge request Cloud_Solution/doctor_app_flutter!232
|
5 years ago |
Mohammad Aljammal
|
d20604aaaf
|
Merge branch 'sultan' into 'development'
Sultan
See merge request Cloud_Solution/doctor_app_flutter!231
|
5 years ago |
Sultan Khan
|
d67b531865
|
bug fix
|
5 years ago |
Sultan Khan
|
31d6ca5593
|
Doctor ID updated
|
5 years ago |
mosazaid
|
4f1c70a3f4
|
Merge branch 'development' into feature-ucaf
|
5 years ago |
mosazaid
|
c9aac6e2e9
|
vital signs solve overflow of the width
|
5 years ago |
Mohammad Aljammal
|
ff9eaeb09f
|
Merge branch 'sultan' into 'development'
reschdule leave
See merge request Cloud_Solution/doctor_app_flutter!230
|
5 years ago |
Sultan Khan
|
ad48415038
|
reschdule leave
|
5 years ago |
mosazaid
|
a51239447b
|
Merge branch 'development' into feature-ucaf
|
5 years ago |
Mohammad Aljammal
|
dc9a9ad4f6
|
Merge branch 'medical-file' into 'development'
medical file
See merge request Cloud_Solution/doctor_app_flutter!229
|
5 years ago |
mosazaid
|
7983f998bd
|
Merge branch 'development' into feature-ucaf
# Conflicts:
# lib/config/localized_values.dart
# lib/util/translations_delegate_base.dart
|
5 years ago |
hussam al-habibeh
|
76cc4d11f8
|
medical file
|
5 years ago |
Sultan Khan
|
ad967e8aae
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
mosazaid
|
ceb0cde34c
|
finish UCAF design and solve problem on vital signs response
|
5 years ago |
Sultan Khan
|
68cfbf8fc7
|
doctor leave
|
5 years ago |
mosazaid
|
88ee50f7cb
|
change make referral page loading behaviour
|
5 years ago |
mosazaid
|
b5a102add3
|
Merge branch 'development' into feature-ucaf
|
5 years ago |
mosazaid
|
ee9ca72057
|
change empty referral message
|
5 years ago |
hussam al-habibeh
|
eef5d57d2f
|
Merge branches 'development' and 'pesrcription-post' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into pesrcription-post
|
5 years ago |
hussam al-habibeh
|
16b949461d
|
prescription post
|
5 years ago |
mosazaid
|
ce164c3cb6
|
Merge branch 'development' into feature-ucaf
# Conflicts:
# lib/config/localized_values.dart
# lib/util/translations_delegate_base.dart
|
5 years ago |
mosazaid
|
0c39dc6693
|
change on vital signs for uncoment the service
|
5 years ago |
mosazaid
|
4b5bec8c50
|
working on UCAF design
|
5 years ago |
Mohammad Aljammal
|
f0f98280b4
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates
Conflicts:
lib/widgets/patients/profile/soap_update/subjective/update_allergies_widget.dart
|
5 years ago |
Sultan Khan
|
9adc5ddd8e
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
6a8c37e0d7
|
doctor leave
|
5 years ago |
Sultan Khan
|
6c894c3d3b
|
sick leave
|
5 years ago |
Elham Rababah
|
ba14d23c05
|
Merge branches 'development' and 'soap_update' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into soap_update
Conflicts:
lib/widgets/patients/profile/profile_medical_info_widget.dart
|
5 years ago |
Elham Rababah
|
e65740761a
|
add improvement on create episode
|
5 years ago |
Sultan Khan
|
43a1e56a8b
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
9bf07d7117
|
reschedule leave
|
5 years ago |
hussam al-habibeh
|
e72ef46efb
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates
|
5 years ago |
hussam al-habibeh
|
4ffeb31181
|
update procedure fixes
|
5 years ago |
Sultan Khan
|
4587fdda59
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
e23bb7ce94
|
reschedule leave
|
5 years ago |
mosazaid
|
b4f813fc2d
|
Merge branch 'development' into feature_admission_request
# Conflicts:
# lib/locator.dart
# lib/routes.dart
|
5 years ago |
Mohammad Aljammal
|
3cb96f35ca
|
Merge branch 'design-updates' into 'development'
Design updates
See merge request Cloud_Solution/doctor_app_flutter!211
|
5 years ago |
hussam al-habibeh
|
75eda8832d
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates
|
5 years ago |
hussam al-habibeh
|
d1a261c847
|
procedure update
|
5 years ago |
mosazaid
|
0e645c2b1f
|
Merge branch 'development' into feature_admission_request
|
5 years ago |
mosazaid
|
b60bac6d6e
|
working on UCAF design
|
5 years ago |
Sultan Khan
|
70d11bfe9e
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Mohammad Aljammal
|
93c0bdf32a
|
return login
|
5 years ago |
Sultan Khan
|
b2aef274bb
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
3c968f0de1
|
doctor leave
|
5 years ago |
hussam al-habibeh
|
b3567df020
|
medical file model
|
5 years ago |
mosazaid
|
e9ffbf06a6
|
Merge branch 'development' into feature_admission_request
|
5 years ago |
hussam al-habibeh
|
9210600e15
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates
|
5 years ago |
mosazaid
|
3578c82f62
|
solve hacking patient screen
|
5 years ago |
mosazaid
|
095a915a89
|
Merge branch 'development' into feature_admission_request
# Conflicts:
# lib/routes.dart
|
5 years ago |
mosazaid
|
cb4ee05b40
|
working on ucaf
|
5 years ago |
hussam al-habibeh
|
ce0303fbce
|
Merge branch 'search_in_soap' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates
Conflicts:
lib/config/config.dart
|
5 years ago |
hussam al-habibeh
|
adb8033138
|
update prescription
|
5 years ago |
Mohammad Aljammal
|
a723ecbf1d
|
fix merger
|
5 years ago |
Mohammad Aljammal
|
5669021add
|
Merge branch 'SOAP' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into search_in_soap
Conflicts:
lib/widgets/patients/profile/SOAP/assessment_page.dart
lib/widgets/patients/profile/SOAP/subjective/add_allergies_widget.dart
lib/widgets/patients/profile/SOAP/subjective/subjective_page.dart
|
5 years ago |
Mohammad Aljammal
|
45edddb49f
|
Add search in Procedure Screen
|
5 years ago |
Mohammad Aljammal
|
b60b45ab53
|
Merge branch 'design-updates' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into search_in_soap
Conflicts:
lib/screens/patients/patient_search_screen.dart
|
5 years ago |
mosazaid
|
ae6cd0e5f8
|
Merge branch 'development' into feature_admission_request
|
5 years ago |
mosazaid
|
5142b5b6c7
|
finish admission request design
|
5 years ago |
hussam al-habibeh
|
b3345a86ef
|
post prescription
|
5 years ago |
Sultan Khan
|
669655307a
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
49e9ecfa4a
|
doctor leave
|
5 years ago |
Elham
|
88c2c04d68
|
Merge branch 'design-updates' into 'development'
post prescription
See merge request Cloud_Solution/doctor_app_flutter!203
|
5 years ago |
Elham Rababah
|
05e7762533
|
fix obj page
|
5 years ago |
Elham Rababah
|
61209663f3
|
Finish arrived
|
5 years ago |
mosazaid
|
4d44d54806
|
Merge branch 'development' into feature_admission_request
|
5 years ago |
Mohammad Aljammal
|
806682b921
|
hack login
|
5 years ago |
Elham Rababah
|
dccf474e70
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_arrival_ist
Conflicts:
lib/client/base_app_client.dart
lib/config/config.dart
lib/core/service/patient_service.dart
lib/core/viewModel/patient_view_model.dart
lib/lookups/patient_lookup.dart
lib/models/patient/patiant_info_model.dart
lib/screens/patients/patients_screen.dart
|
5 years ago |
mosazaid
|
873ee67eb7
|
Merge branch 'development' into feature_admission_request
# Conflicts:
# lib/routes.dart
|
5 years ago |
mosazaid
|
433b2933c4
|
working with admission request and some changes in vital signs
|
5 years ago |
mosazaid
|
f35eff1220
|
working with admission request
|
5 years ago |
hussam al-habibeh
|
17079a1bd9
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates
|
5 years ago |
hussam al-habibeh
|
9d8514c83b
|
post prescription
|
5 years ago |
Mohammad Aljammal
|
6f2e764deb
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into hack_login
Conflicts:
lib/client/base_app_client.dart
lib/routes.dart
|
5 years ago |
Mohammad Aljammal
|
04ed76069c
|
hack login
|
5 years ago |
Mohammad Aljammal
|
21252c6ae9
|
Merge branch 'feature-vital-sign' into 'development'
Feature vital sign
See merge request Cloud_Solution/doctor_app_flutter!201
|
5 years ago |
mosazaid
|
78e2c662c8
|
finish vital sign feature, and adding makeReferralResponse
|
5 years ago |
mosazaid
|
25d884c774
|
Merge branch 'development' into feature-vital-sign
# Conflicts:
# lib/config/localized_values.dart
# lib/locator.dart
# lib/routes.dart
# lib/util/helpers.dart
# lib/util/translations_delegate_base.dart
# lib/widgets/patients/profile/SOAP/add_SOAP_index.dart
# pubspec.lock
|
5 years ago |
mosazaid
|
b5c937bd86
|
Working on vitalSigns,
Merge branch 'development' into feature-vital-sign
# Conflicts:
# lib/routes.dart
|
5 years ago |
hussam al-habibeh
|
c7bfe24207
|
post procedure
|
5 years ago |
mosazaid
|
a71da8e4ef
|
working on vital signs
|
5 years ago |
hussam al-habibeh
|
d3bf97fdd8
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates
Conflicts:
lib/config/config.dart
lib/config/localized_values.dart
lib/locator.dart
lib/routes.dart
lib/util/translations_delegate_base.dart
lib/widgets/shared/TextFields.dart
lib/widgets/shared/app_buttons_widget.dart
lib/widgets/shared/app_text_form_field.dart
lib/widgets/shared/app_texts_widget.dart
|
5 years ago |
mosazaid
|
d11a8e6209
|
Merge branch 'development' into feature-vital-sign
# Conflicts:
# lib/core/service/base/base_service.dart
# lib/locator.dart
|
5 years ago |
Sultan Khan
|
1da12873c7
|
dashboard
|
5 years ago |
mosazaid
|
aafcd89222
|
working on vitalSigns feature
|
5 years ago |
hussam al-habibeh
|
1ce6571668
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates
Conflicts:
lib/config/localized_values.dart
lib/locator.dart
lib/routes.dart
lib/screens/patients/profile/refer_patient_screen.dart
lib/util/translations_delegate_base.dart
lib/widgets/patients/profile/profile_medical_info_widget.dart
lib/widgets/shared/TextFields.dart
lib/widgets/shared/app_text_form_field.dart
|
5 years ago |
Sultan Khan
|
5585274b18
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
hussam al-habibeh
|
749e870ea2
|
get procedures get prescription
|
5 years ago |
Sultan Khan
|
5dcc03cfa8
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
mosazaid
|
47e9d2a558
|
Merge branch 'development' into feature--patient-referral
# Conflicts:
# lib/client/base_app_client.dart
|
5 years ago |
mosazaid
|
4ac8fe4681
|
finish refferal module except accept/reject referral
&
Merge branch 'development' into feature--patient-referral
# Conflicts:
# lib/client/base_app_client.dart
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/locator.dart
# lib/util/translations_delegate_base.dart
|
5 years ago |
Elham Rababah
|
7001940d0d
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into login_new
|
5 years ago |
mosazaid
|
7cefbb4dbd
|
add referral pages
|
5 years ago |
Sultan Khan
|
8d58348267
|
dashboard changes
|
5 years ago |
Elham Rababah
|
c15300125e
|
First step objective_page.dart
|
5 years ago |
Sultan Khan
|
e61f3f0281
|
add sick leave
|
5 years ago |
Elham Rababah
|
518c30bdeb
|
Merge branches 'SOAP' and 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into SOAP
Conflicts:
lib/config/localized_values.dart
|
5 years ago |
Elham Rababah
|
44779e6ee7
|
patient screen
|
5 years ago |
Elham Rababah
|
9c018d3c55
|
first step from patient arrival
|
5 years ago |
Sultan Khan
|
4f96cff585
|
sick leave
|
5 years ago |
Sultan Khan
|
e5d542f1d0
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Elham Rababah
|
46cdd9482c
|
First step from SOAP
|
5 years ago |
Sultan Khan
|
ba2697c917
|
sick leave
|
5 years ago |
Elham Rababah
|
4eee5cd9d8
|
new login type
|
5 years ago |
mosazaid
|
bb1f101e94
|
finish re-design refer-patient screen
|
5 years ago |
Sultan Khan
|
900264bc26
|
sick leave
|
5 years ago |
Sultan Khan
|
76e10459e0
|
sick leave
|
5 years ago |
Sultan Khan
|
cc1a63786f
|
sick leave
|
5 years ago |
hussam al-habibeh
|
cbb8937b1d
|
'12/14'
|
5 years ago |
hussam al-habibeh
|
7de6a8e99f
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates
Conflicts:
lib/config/localized_values.dart
lib/landing_page.dart
lib/screens/patients/profile/refer_patient_screen.dart
|
5 years ago |
hussam al-habibeh
|
c581638e00
|
refer_patient_screen 'not finshed'
|
5 years ago |
Elham Rababah
|
9f19b2566f
|
finish refactor provider
|
5 years ago |
Elham Rababah
|
64dbcce06f
|
finish and remove patient provider
|
5 years ago |
Elham
|
6057e6a266
|
Merge branch 'refactor' into 'development'
Refactor
See merge request Cloud_Solution/doctor_app_flutter!180
|
5 years ago |
Elham
|
746765f4d7
|
Merge branch 'design-updates' into 'development'
patients_screen design update
See merge request Cloud_Solution/doctor_app_flutter!179
|
5 years ago |
Elham Rababah
|
1b1e8f0712
|
second step from patient provider
|
5 years ago |
hussam al-habibeh
|
6f90c31f9f
|
patients_screen design update
|
5 years ago |
Elham Rababah
|
6ab73916eb
|
first step from patient provider
|
5 years ago |
mosazaid
|
e5341e3031
|
Merge branch 'development' into replay-design
# Conflicts:
# lib/config/localized_values.dart
# lib/screens/patients/patients_screen.dart
|
5 years ago |
mosazaid
|
f9ae2559f0
|
working on referral reply screen
|
5 years ago |
Elham
|
664d2b5c2b
|
Merge branch 'design-updates' into 'development'
patients out and patients in screens design updates
See merge request Cloud_Solution/doctor_app_flutter!177
|
5 years ago |
mosazaid
|
a55b605a6c
|
Merge branch 'development' into replay-design
|
5 years ago |
mosazaid
|
5ed9aea5a7
|
fix HexColor library error
|
5 years ago |
hussam al-habibeh
|
6bbc629060
|
patients out and patients in screens design updates
|
5 years ago |
Elham Rababah
|
58de54997a
|
refactor search medicine Service
|
5 years ago |
Elham Rababah
|
7863f13b0e
|
Merge branches 'development' and 'refactor' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into refactor
|
5 years ago |
Elham Rababah
|
45cde2cb72
|
refactor Referred Patient Service
|
5 years ago |
Elham
|
f641698d6c
|
Merge branch 'refactor' into 'development'
refactor Referral Patient Service
See merge request Cloud_Solution/doctor_app_flutter!174
|
5 years ago |
hussam al-habibeh
|
911921e0b8
|
in-patient && out-patient
|
5 years ago |
Elham Rababah
|
df9d151f46
|
refactor Referral Patient Service
|
5 years ago |
Elham Rababah
|
6e461f7212
|
refactor Schedule service
|
5 years ago |
Elham Rababah
|
0c7c4d7dae
|
refactor doctor replay service
|
5 years ago |
Mohammad Aljammal
|
3cedf3c927
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into add_mvvm
Conflicts:
lib/providers/medicine_provider.dart
|
5 years ago |
Mohammad Aljammal
|
e6edd5449f
|
Add MVVM
|
5 years ago |
Elham Rababah
|
91cc76a9cf
|
medicine search fix bugs =
|
5 years ago |
Elham Rababah
|
ec3b69f0cb
|
The Patient services Names the words should be in separate line.
|
5 years ago |
Elham Rababah
|
53862ec1b3
|
fix bugs in patient search
|
5 years ago |
Elham Rababah
|
f1721b686d
|
fix loader inside pharmacies_list
|
5 years ago |
Elham Rababah
|
9a18c405c7
|
comment code not working in good way until we fixed
|
5 years ago |
Elham Rababah
|
1ad3652913
|
Fix issue related to pharmacies_list_screen.dart
|
5 years ago |
Elham Rababah
|
b308dc5826
|
change doctor app icons and optimization
|
6 years ago |
Elham Rababah
|
8980fc03aa
|
Finish Patient search design
|
6 years ago |
Elham Rababah
|
0d8455faa7
|
Finish medicine search design
|
6 years ago |
Elham Rababah
|
871bd6ab20
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into medicine_desgin
Conflicts:
lib/config/localized_values.dart
lib/screens/medicine/medicine_search_screen.dart
lib/util/translations_delegate_base.dart
lib/widgets/shared/app_text_form_field.dart
|
6 years ago |
Elham Rababah
|
fbc99d681f
|
First step from medicine search and change the logo
|
6 years ago |
Mohammad Aljammal
|
2e4f9fa335
|
Merge remote-tracking branch 'origin/development' into development
|
6 years ago |
Mohammad Aljammal
|
146a53a6e5
|
Merge branch 'sultan' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
Conflicts:
lib/config/config.dart
lib/models/pharmacies/pharmacies_List_request_model.dart
lib/screens/medicine/medicine_search_screen.dart
|
6 years ago |
Elham Rababah
|
d28d2ecdeb
|
add improvement dashboard screen design
|
6 years ago |
Elham Rababah
|
dff6c25031
|
add improvement dashboard screen design
|
6 years ago |
Elham Rababah
|
e37a3e8ce1
|
Finish dashboard screen design
|
6 years ago |
Sultan Khan
|
6eb2da3770
|
voice search
|
6 years ago |
hussam al-habibeh
|
efc5db9f5b
|
versionID update
|
6 years ago |
hussam al-habibeh
|
ba72d40deb
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into hussam
|
6 years ago |
hussam al-habibeh
|
b6d2cdb1db
|
fixing clinic name in app reopening
|
6 years ago |
Sultan Khan
|
3f7ef48fd5
|
live care chages
|
6 years ago |
hussam al-habibeh
|
d449086f9a
|
Fixing Clinic name in app reopening
|
6 years ago |
Mohammad ALjammal
|
d4b3e42070
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
Conflicts:
lib/screens/dashboard_screen.dart
|
6 years ago |
Elham Rababah
|
287bb20d12
|
fix issues ios
|
6 years ago |
Mohammad ALjammal
|
d5825ccb85
|
fix issues
|
6 years ago |
Mohammad ALjammal
|
d22ce32cdb
|
add call back android
|
6 years ago |
hussam al-habibeh
|
acaaca314e
|
get clinic list after changing the language
|
6 years ago |
hussam al-habibeh
|
aa57f4c4d7
|
get clinic list after changing the language
|
6 years ago |
hussam al-habibeh
|
629ccbeda8
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into hussam
Conflicts:
lib/screens/dashboard_screen.dart
|
6 years ago |
hussam al-habibeh
|
d866d8b9de
|
get clinic list
|
6 years ago |
Mohammad Aljammal
|
9dc1c27334
|
Merge branch 'sultan' into 'development'
Sultan
See merge request Cloud_Solution/doctor_app_flutter!143
|
6 years ago |
Sultan Khan
|
8a9d20990b
|
Video call page updated
|
6 years ago |
Sultan Khan
|
cad6892c8b
|
Video call page updated
|
6 years ago |
ibrahim albitar
|
98950890a0
|
Add User Guid Module
|
6 years ago |
Sultan Khan
|
b66eebfd10
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
6 years ago |
Sultan Khan
|
3b0aff2efa
|
overflow issue and model mapped
|
6 years ago |
Mohammad ALjammal
|
c671059a03
|
fix issues in video call
|
6 years ago |
Mohammad ALjammal
|
270d7ffa6d
|
Merge branch 'sultan' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into mohammad
Conflicts:
lib/main.dart
|
6 years ago |
Mohammad ALjammal
|
7cc1c36ab4
|
change Medicine Provider to use BaseAppClient
|
6 years ago |
Sultan Khan
|
dd3154a498
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/util/translations_delegate_base.dart
|
6 years ago |
Sultan Khan
|
bde86ef829
|
live care features added.
|
6 years ago |
Mohammad ALjammal
|
42a639f8b8
|
integration with opentok ios
|
6 years ago |
Mohammad ALjammal
|
990d36d804
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into mohammad
|
6 years ago |
Mohammad ALjammal
|
868b118243
|
integration with OpenTok android
|
6 years ago |
Elham
|
7fe2a96065
|
Merge branch 'hussam' into 'development'
translation 'updates'
See merge request Cloud_Solution/doctor_app_flutter!136
|
6 years ago |
hussam al-habibeh
|
000315ac0e
|
translation 'updates'
|
6 years ago |
ibrahim albitar
|
c07f84ff78
|
fixing and enhancments
|
6 years ago |
Sultan Khan
|
f052ffc8f3
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
6 years ago |
Sultan Khan
|
93936c3c55
|
video call screen added
|
6 years ago |
Elham
|
c35c6f7444
|
Merge branch 'elham' into 'development'
Elham
See merge request Cloud_Solution/doctor_app_flutter!134
|
6 years ago |
Elham Rababah
|
89241460da
|
change clinic name
|
6 years ago |
hussam al-habibeh
|
91ffdabd73
|
Translation stage five
|
6 years ago |
hussam al-habibeh
|
fb6d54faaf
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into hussam
Conflicts:
lib/screens/dashboard_screen.dart
|
6 years ago |
hussam al-habibeh
|
054933b280
|
Translation stage four
|
6 years ago |
Elham Rababah
|
bd3ce0a4d4
|
refactor models
|
6 years ago |
erababah
|
cad096d8c7
|
fix issue on ios and improve structure by Elham & mohammad
|
6 years ago |
Mohammad ALjammal
|
aff8f87a2f
|
fix merge issues
|
6 years ago |
Mohammad ALjammal
|
63dd8262da
|
Merge branch 'sultan' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
Conflicts:
lib/screens/dashboard_screen.dart
lib/widgets/patients/profile/profile_medical_info_widget.dart
|
6 years ago |
hussam al-habibeh
|
ea78db6a75
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into hussam
# Conflicts:
# lib/config/localized_values.dart
# lib/screens/dashboard_screen.dart
# lib/util/translations_delegate_base.dart
|
6 years ago |
hussam al-habibeh
|
b63d8906bc
|
Merge branch 'hussam' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
Conflicts:
lib/screens/profile_screen.dart
|
6 years ago |
Sultan Khan
|
79c2de3f96
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
# Conflicts:
# fonts/DoctorApp.ttf
# lib/presentation/doctor_app_icons.dart
|
6 years ago |
hussam alhababieh
|
a02fe9c83d
|
translation stage two
|
6 years ago |
ibrahim albitar
|
fc1d4c9a9b
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
|
6 years ago |
ibrahim albitar
|
57708de8e4
|
pharmacies screen scrollview
|
6 years ago |
amjad nabil amireh
|
640829f454
|
Merge branch 'Amjad_search' into 'development'
Modify patiant screen icon avatar
See merge request Cloud_Solution/doctor_app_flutter!121
|
6 years ago |
Amjad Amireh
|
4e62947df2
|
Modify patiant screen icon avatar
|
6 years ago |
Elham
|
69b02e29c5
|
Merge branch 'elham' into 'development'
Elham
See merge request Cloud_Solution/doctor_app_flutter!120
|
6 years ago |
Elham Rababah
|
574a951fcf
|
finish clinic exept design
|
6 years ago |
hussam alhababieh
|
b0005e72f9
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into hussam
|
6 years ago |
hussam alhababieh
|
b4570d7bd1
|
translation for pages stage one
|
6 years ago |
Elham Rababah
|
165d697e33
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into elham
|
6 years ago |
Elham Rababah
|
5779fb9ad7
|
change profile based on change clinic
|
6 years ago |
Amjad Amireh
|
230bdb2430
|
Modify Dr profile data dynamic size
|
6 years ago |
Elham Rababah
|
ef8dfc5b5f
|
first step form change clinic
|
6 years ago |
ibrahim albitar
|
09ca836ea7
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
|
6 years ago |
ibrahim albitar
|
6fd43a281d
|
fixing
|
6 years ago |
Mohammad Aljammal
|
f6aec27788
|
Merge branch 'mohammad' into 'development'
fix issues in Patient
See merge request Cloud_Solution/doctor_app_flutter!115
|
6 years ago |
Mohammad ALjammal
|
d52429564d
|
fix issues in Patient
|
6 years ago |
hussam alhababieh
|
dcbf1312b7
|
translate dashboard/patient search
|
6 years ago |
hussam alhababieh
|
097d8df8c0
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into hussam
|
6 years ago |
hussam alhababieh
|
b178f08278
|
translate dashboard and patient search
|
6 years ago |
Mohammad ALjammal
|
b758ae8196
|
fix issues
|
6 years ago |
Mohammad ALjammal
|
c7f1c6d174
|
Merge branch 'ibrahim-merge' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
Conflicts:
lib/client/base_app_client.dart
lib/config/config.dart
lib/screens/auth/login_screen.dart
lib/screens/medicine/medicine_search_screen.dart
lib/widgets/auth/verfiy_account.dart
|
6 years ago |
Mohammad ALjammal
|
a3730e4efb
|
fix issues with sultan branch
|
6 years ago |
Mohammad ALjammal
|
79eb6b19d0
|
Merge branch 'sultan' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into ibrahim-merge
Conflicts:
lib/config/config.dart
lib/presentation/doctor_app_icons.dart
lib/screens/dashboard_screen.dart
lib/screens/medicine/medicine_search_screen.dart
lib/widgets/patients/profile/profile_medical_info_widget.dart
|
6 years ago |
Mohammad ALjammal
|
edd25ff437
|
Merge branch 'Amjad_search' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into ibrahim-merge
Conflicts:
lib/config/config.dart
|
6 years ago |
Mohammad ALjammal
|
692674fac0
|
merge ibrahim
|
6 years ago |
Mohammad ALjammal
|
80664439d9
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into ibrahim-merge
|
6 years ago |
Mohammad ALjammal
|
ed857d8d54
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
Conflicts:
lib/client/base_app_client.dart
lib/screens/dashboard_screen.dart
|
6 years ago |
Mohammad ALjammal
|
fc2297394e
|
Merge branch 'sultan' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
Conflicts:
lib/config/config.dart
lib/presentation/doctor_app_icons.dart
lib/screens/dashboard_screen.dart
lib/screens/medicine/medicine_search_screen.dart
lib/widgets/patients/profile/profile_medical_info_widget.dart
|
6 years ago |
Mohammad ALjammal
|
06f2aaef4b
|
Merge branch 'ibrahim' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into dev-elham
Conflicts:
lib/client/base_app_client.dart
lib/screens/auth/login_screen.dart
lib/widgets/auth/login_form.dart
lib/widgets/auth/verfiy_account.dart
|
6 years ago |
Mohammad ALjammal
|
114edf8924
|
Merge remote-tracking branch 'origin/development' into development
|
6 years ago |
Mohammad ALjammal
|
5294948a58
|
fix issues
|
6 years ago |
ibrahim albitar
|
e0c65222d2
|
enhancment insurance approvals
|
6 years ago |
Amjad Amireh
|
68031519e2
|
Merge branch 'Amjad_search' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
Conflicts:
lib/config/config.dart
|
6 years ago |
Amjad Amireh
|
e0b841a4c1
|
change font size
|
6 years ago |
Amjad Amireh
|
3eeac2734b
|
Modify Patiant screen List style
|
6 years ago |
Elham
|
b34aec65b8
|
Merge branch 'elham' into 'development'
Elham
See merge request Cloud_Solution/doctor_app_flutter!107
|
6 years ago |
Elham
|
25d42c4a26
|
Revert "Merge branch 'elham' into 'master'"
This reverts merge request !105
|
6 years ago |
Elham
|
73fd8932d4
|
Merge branch 'elham' into 'master'
Elham
See merge request Cloud_Solution/doctor_app_flutter!105
|
6 years ago |
Elham Rababah
|
395a7947c3
|
improve auth app
|
6 years ago |
Amjad Amireh
|
3410d691f8
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into Amjad_search
Conflicts:
lib/config/config.dart
|
6 years ago |
Mohammad ALjammal
|
513fcd24b1
|
Merge remote-tracking branch 'origin/development' into development
# Conflicts:
# lib/config/config.dart
|
6 years ago |
Mohammad ALjammal
|
9b065036ae
|
fix issues in get patients service
|
6 years ago |
ibrahim albitar
|
4638ba56a2
|
jira fixes
|
6 years ago |
Salman Afzal
|
11f10f1eea
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
# Conflicts:
# lib/config/config.dart
# lib/screens/dashboard_screen.dart
# lib/screens/patients/patients_screen.dart
|
6 years ago |
Amjad Amireh
|
f3c20d9866
|
Modify Patiant screen List style
|
6 years ago |
ibrahim albitar
|
937f8ecd6a
|
fix
|
6 years ago |
ibrahim albitar
|
480c64d25a
|
complete refer patient
|
6 years ago |
Elham Rababah
|
d4ba01de5b
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into elham
|
6 years ago |
Elham Rababah
|
a42f06c9ff
|
modify hospital provider to make it call app base
|
6 years ago |
Mohammad ALjammal
|
4a8b97b189
|
Merge branch 'mohammad' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
Conflicts:
lib/providers/patients_provider.dart
lib/routes.dart
|
6 years ago |
Mohammad ALjammal
|
0c94188405
|
Done Prescription Details Screen
|
6 years ago |
Mohammad ALjammal
|
c1b21dc1c3
|
Merge branch 'elham' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into mohammad
|
6 years ago |
ibrahim albitar
|
14527e19b1
|
fix issues
|
6 years ago |
unknown
|
ce5ee4a21e
|
Merge branch 'develop' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
Conflicts:
lib/providers/patients_provider.dart
lib/routes.dart
lib/widgets/patients/profile/profile_medical_info_widget.dart
|
6 years ago |
Mohammad ALjammal
|
76f8eba86e
|
create Prescription In and Out Patient
|
6 years ago |
Salman Afzal
|
a48ad33f36
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
6 years ago |
Salman Afzal
|
a914ff9367
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
# Conflicts:
# lib/config/config.dart
# lib/presentation/doctor_app_icons.dart
|
6 years ago |
unknown
|
39cc4fa4bf
|
refere to doctor
|
6 years ago |
Elham Rababah
|
610ae3c1fb
|
add in patient prescription details screen
|
6 years ago |
Amjad Amireh
|
d136537b44
|
Modify Patiant screen List style
|
6 years ago |
Mohammad ALjammal
|
2ad96dad88
|
create Prescription In and Out Patient
|
6 years ago |
Mohammad ALjammal
|
33b59514a0
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into mohammad
|
6 years ago |
Mohammad ALjammal
|
c16c8897be
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into mohammad
Conflicts:
lib/screens/dashboard_screen.dart
|
6 years ago |
Elham Rababah
|
6e5c2aca4d
|
Merge branch 'mohammad' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into elham
|
6 years ago |
Elham Rababah
|
1e507cca3e
|
finish resend code
|
6 years ago |
Mohammad ALjammal
|
6d8289a0d4
|
change bottom bar navigation
|
6 years ago |
Amjad Amireh
|
cc2c0f9a1e
|
Modify Patiant screen List style
|
6 years ago |
Amjad Amireh
|
49f8da4a05
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into Amjad_search
|
6 years ago |
Mohammad ALjammal
|
c8b2604110
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into mohammad
Conflicts:
lib/widgets/doctor/my_referred_patient_widget.dart
|
6 years ago |
Mohammad ALjammal
|
8157e1bc31
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into Amjad_search
|
6 years ago |
Mohammad ALjammal
|
644cfac790
|
change design prescription and add new services
|
6 years ago |
Elham Rababah
|
40eb7f8064
|
improve vital sgin and return the correct color to login header
|
6 years ago |
Salman Afzal
|
5f6e9104d0
|
scroll change
|
6 years ago |
Amjad Amireh
|
0ed3481b42
|
Localization comment
|
6 years ago |
Salman Afzal
|
50e9dc0980
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
# Conflicts:
# pubspec.yaml
|
6 years ago |
Mohammad ALjammal
|
c7ad16cbcd
|
update design Radiology Screen and create Radiology Report Screen
|
6 years ago |
Salman Afzal
|
4239124f1a
|
dashboard icon updated
|
6 years ago |
Amjad Amireh
|
86d0d52f05
|
SVG female
|
6 years ago |
Mohammad ALjammal
|
b3befa12db
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
6 years ago |
Mohammad ALjammal
|
5d7937c08d
|
add arrow back in PatientProfileScreen , PatientSearchScreen and PatientsScreen
|
6 years ago |
Salman Afzal
|
ac612f0eda
|
dashboard and patient app
|
6 years ago |
Mohammad ALjammal
|
6319af97f2
|
Merge branch 'elham' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into mohammad
|
6 years ago |
Elham Rababah
|
55a4bfba83
|
hot fix
|
6 years ago |
Mohammad ALjammal
|
6a3e8baa86
|
Merge branch 'elham' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into mohammad
|
6 years ago |
Mohammad ALjammal
|
9b5658c00e
|
change design My Referral and My Referral Patient
|
6 years ago |
Elham Rababah
|
489ad9e729
|
improve code and add AppExpandableNotifier
|
6 years ago |
Elham Rababah
|
10877ac658
|
improve vital sign item details
|
6 years ago |
unknown
|
40a0c1281a
|
Merge branches 'develop' and 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into develop
|
6 years ago |
unknown
|
61674bec47
|
new pages
|
6 years ago |
Mohammad ALjammal
|
73f0cd7795
|
marge with master
|
6 years ago |
Mohammad ALjammal
|
4f0059d092
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into mohammad
Conflicts:
lib/screens/doctor/my_referred_patient_screen.dart
|
6 years ago |
Mohammad ALjammal
|
627bac340d
|
marge with master
|
6 years ago |
Mohammad ALjammal
|
540d902236
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into mohammad
Conflicts:
lib/providers/patients_provider.dart
|
6 years ago |
Amjad Amireh
|
b8e5ab9a46
|
design
|
6 years ago |
Mohammad ALjammal
|
c6bbc1c2f5
|
fix patient profile details
|
6 years ago |
Mohammad ALjammal
|
14edbff8b4
|
Merge branch 'elham' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into mohammad
Conflicts:
lib/screens/patients/profile/vital_sign/body_measurements_screen.dart
|
6 years ago |
Mohammad ALjammal
|
1f5bca3adc
|
patient profile details
|
6 years ago |
Elham Rababah
|
0d30fd6212
|
vitalsign details
|
6 years ago |
Amjad Amireh
|
29239fddde
|
modify search
|
6 years ago |
Amjad Amireh
|
505b3383ff
|
patient screen Modify
|
6 years ago |
Amjad Amireh
|
3c3d85c255
|
My Referred Patient
|
6 years ago |
ibrahim albitar
|
d9f7f586f8
|
Merge branch 'develop' into 'master'
Develop
See merge request Cloud_Solution/doctor_app_flutter!79
|
6 years ago |
unknown
|
6b12a8a689
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into develop
|
6 years ago |
unknown
|
0c112ebca5
|
finished new screens
|
6 years ago |
Elham Rababah
|
bd24b7c196
|
TimeSeriesChart as widget
|
6 years ago |
Elham Rababah
|
1347198928
|
Merge branch 'mohammad' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into elham
|
6 years ago |
Elham Rababah
|
92dd877042
|
chart works
|
6 years ago |
Mohammad ALjammal
|
ef48a995eb
|
Merge branch 'elham' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into mohammad
|
6 years ago |
Elham Rababah
|
6ebee5dbf6
|
first step form chart
|
6 years ago |
Amjad Amireh
|
d3c2efc45d
|
svg avatar Icon and library
|
6 years ago |
unknown
|
8c46c93e86
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into develop
|
6 years ago |
unknown
|
9f4802c225
|
progress note
|
6 years ago |
Amjad Amireh
|
317742b55a
|
Svg component
|
6 years ago |
Mohammad ALjammal
|
2349a596ea
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into mohammad
Conflicts:
pubspec.lock
pubspec.yaml
|
6 years ago |
Elham
|
f9e2fd58ab
|
Merge branch 'elham' into 'master'
add login logic with silent options
See merge request Cloud_Solution/doctor_app_flutter!75
|
6 years ago |
Elham Rababah
|
c5bbb0495a
|
add login logic with silent options
|
6 years ago |
Mohammad ALjammal
|
9ce7d3267b
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into mohammad
|
6 years ago |
Mohammad ALjammal
|
9572e16627
|
done My Referral Patient and create Base App Client
|
6 years ago |
Amjad Amireh
|
fff2b32dee
|
ExpandableItem widget
|
6 years ago |
Amjad Amireh
|
be60383916
|
ListItem Expand
|
6 years ago |
Amjad Amireh
|
ae064cc14a
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into Amjad_search
|
6 years ago |
Amjad Amireh
|
8f860ab4cf
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into Amjad_search
|
6 years ago |
Amjad Amireh
|
9aae4b8650
|
amjad modified to expand list
|
6 years ago |
Mohammad ALjammal
|
7d3bfddd68
|
update design my schedule and doctor replay
|
6 years ago |
ibrahim albitar
|
7f5831335b
|
Merge branch 'develop' into 'master'
Develop
See merge request Cloud_Solution/doctor_app_flutter!70
|
6 years ago |
unknown
|
7d1cfb7b4e
|
add new screens
|
6 years ago |
amjad nabil amireh
|
72cea26787
|
Merge branch 'Amjad_search' into 'master'
New Design from Mahmoud
See merge request Cloud_Solution/doctor_app_flutter!69
|
6 years ago |
Amjad Amireh
|
bb606e6a1d
|
New Design from Mahmoud
|
6 years ago |
Mahmoud Shrouf
|
0670360af8
|
Merge branch 'Mahmoud' into 'master'
My Changes Before Demo
See merge request Cloud_Solution/doctor_app_flutter!67
|
6 years ago |
Mahmoud Shrouf
|
394bd514ab
|
My Changes Before Demo
|
6 years ago |
her_username
|
80fdd81ae0
|
change name in Doctor Reply
|
6 years ago |
unknown
|
3653c90665
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into develop
|
6 years ago |
her_username
|
f3102ef99f
|
edit doctor reply provider and schedule provider
|
6 years ago |
her_username
|
5fdf34b917
|
done qr code
|
6 years ago |
her_username
|
c1ddff2994
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into mohammad
Conflicts:
lib/screens/patients/patients_screen.dart
|
6 years ago |
her_username
|
312a4741a0
|
edit patient search
|
6 years ago |
Amjad Amireh
|
c7fccbf708
|
verify clinic id
|
6 years ago |
unknown
|
b94011af47
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into develop
|
6 years ago |
her_username
|
111d90d56f
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into mohammad
Conflicts:
lib/models/patient/patiant_info_model.dart
pubspec.lock
|
6 years ago |
her_username
|
7d3856f2b2
|
done QR reader
|
6 years ago |
Elham Rababah
|
146e913113
|
add choose clinic to login process
|
6 years ago |
unknown
|
0c44c57c2f
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into develop
|
6 years ago |
unknown
|
35205b7024
|
patient medical info
|
6 years ago |
Amjad Amireh
|
2f0c400328
|
Modify time and date
|
6 years ago |
Amjad Amireh
|
ce1a502d32
|
Doctor id dynamic
|
6 years ago |
Amjad Amireh
|
aa72674805
|
Modify Error validation
|
6 years ago |
Elham Rababah
|
0748a569ac
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into elham
|
6 years ago |
Elham Rababah
|
1e656af143
|
handelCatcherrorCase
|
6 years ago |
amjad nabil amireh
|
a520e159e2
|
Merge branch 'Amjad_search' into 'master'
modify search patient
See merge request Cloud_Solution/doctor_app_flutter!58
|
6 years ago |
Amjad Amireh
|
f9346c3fef
|
modify search patiant
|
6 years ago |
Elham
|
54d1881ac0
|
Merge branch 'elham' into 'master'
add doctor profile to shaerd pref
See merge request Cloud_Solution/doctor_app_flutter!56
|
6 years ago |
Elham Rababah
|
bc395c3fcc
|
add doctor profile to shaerd pref
|
6 years ago |
amjad nabil amireh
|
6134347e8e
|
Merge branch 'Amjad_search' into 'master'
Amjad search
See merge request Cloud_Solution/doctor_app_flutter!55
|
6 years ago |
Amjad Amireh
|
ac4489c452
|
patiant model modify
|
6 years ago |
her_username
|
b07ff8154c
|
update local for doctor replay , my schedule and message screen
|
6 years ago |
Elham Rababah
|
16832129c3
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into elham
|
6 years ago |
Elham Rababah
|
142c8d97e3
|
first step from body measurements
|
6 years ago |
her_username
|
216374aed2
|
change class name and change init route
|
6 years ago |
her_username
|
f098520a80
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into mohammad
|
6 years ago |
her_username
|
3fbc2dabef
|
remove i18n package, change the location localized values,
change provider name and create new provider
|
6 years ago |
Elham Rababah
|
cabbf03eec
|
vital_sign_details
|
6 years ago |
Elham Rababah
|
51835c231a
|
improtant fix in SliverGrid
|
6 years ago |
Elham Rababah
|
00bce3403e
|
first step from the vital details
|
6 years ago |
her_username
|
cc929ba4a5
|
update Localizations
|
6 years ago |
Elham Rababah
|
8594f1a498
|
change the color desing in profile
|
6 years ago |
Elham Rababah
|
7c291f8d63
|
add comment and fix some pugs
|
6 years ago |
amjad nabil amireh
|
f4e82f9fd9
|
Merge branch 'Amjad_search' into 'master'
Filter search in outpatient and format time
See merge request Cloud_Solution/doctor_app_flutter!51
|
6 years ago |
Amjad Amireh
|
c09c1599fc
|
Filter search in outPatiant and format time
|
6 years ago |
ibrahim albitar
|
211a40c706
|
Merge branch 'develop' into 'master'
Develop
See merge request Cloud_Solution/doctor_app_flutter!50
|
6 years ago |
unknown
|
80b6716091
|
call phramicies
|
6 years ago |
Elham Rababah
|
7a370c29dc
|
use ProfileImageWidget in patient profile
|
6 years ago |
unknown
|
f26df864ee
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into develop
|
6 years ago |
unknown
|
3c03647392
|
out of stuk
|
6 years ago |
Elham Rababah
|
ce8fa791e9
|
return values to daynmic
|
6 years ago |
Elham Rababah
|
d09ba4632e
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into elham
|
6 years ago |
Elham Rababah
|
1a98e37a7f
|
add prescription add radiology
|
6 years ago |
Amjad Amireh
|
8457cbd5c3
|
Search filter name
|
6 years ago |
Elham Rababah
|
4309a2141a
|
small fix on desing and create model
|
6 years ago |