mosazaid
|
09f87a6cbd
|
Merge branch 'development' into in-patient-changes
# Conflicts:
# lib/screens/patients/profile/lab_result/LabResultWidget.dart
|
5 years ago |
Elham Rababah
|
79037d8fc7
|
add condition
|
5 years ago |
hussam al-habibeh
|
c7275a3106
|
small update in procedure
|
5 years ago |
mosazaid
|
d78a3e168e
|
hoh design fixes
|
5 years ago |
Mohammad Aljammal
|
650a949c6a
|
Merge branch 'progress_note' into 'development'
Progress note
See merge request Cloud_Solution/doctor_app_flutter!542
|
5 years ago |
Elham Rababah
|
9d780f72b4
|
remove commented code
|
5 years ago |
Mohammad Aljammal
|
36189adf94
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services
Conflicts:
lib/widgets/shared/doctor_card.dart
|
5 years ago |
Mohammad Aljammal
|
ae8882fbae
|
Merge branch 'in-patient-changes' into 'development'
In patient changes
See merge request Cloud_Solution/doctor_app_flutter!539
|
5 years ago |
Elham Rababah
|
8d7fef3db9
|
fix some issue on progress_note_screen
|
5 years ago |
hussam al-habibeh
|
0e65b743e3
|
Insurance Approval In Patient
|
5 years ago |
mosazaid
|
78f2ab5ae3
|
design fixes
|
5 years ago |
hussam al-habibeh
|
e3102b3f5e
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into in_patient_services
Conflicts:
lib/widgets/patients/profile/profile_medical_info_widget_in_patient.dart
|
5 years ago |
hussam al-habibeh
|
94e598c5f2
|
Insurance Approval In Patient
|
5 years ago |
mosazaid
|
2bf003c100
|
Merge branch 'development' into in-patient-changes
|
5 years ago |
mosazaid
|
33545d1180
|
work on in paitent referral
|
5 years ago |
Mohammad Aljammal
|
fd790978c4
|
add new referral service
|
5 years ago |
Sultan Khan
|
608198762d
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
d0a39ca3d4
|
fixes
|
5 years ago |
Elham Rababah
|
acc3ecdbbe
|
cancel progress_note part
|
5 years ago |
Elham Rababah
|
4a263dda8a
|
Merge branches 'development' and 'progress_note' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into progress_note
Conflicts:
lib/config/config.dart
|
5 years ago |
Elham Rababah
|
82285ccf39
|
show progress_note part
|
5 years ago |
Mohammad Aljammal
|
e4aae762cc
|
Merge branch 'in-patient-changes' into 'development'
In patient changes
See merge request Cloud_Solution/doctor_app_flutter!536
|
5 years ago |
mosazaid
|
34e9a3797c
|
Merge branch 'development' into in-patient-changes
|
5 years ago |
Sultan Khan
|
822dc7da77
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
feef001323
|
bug fixes
|
5 years ago |
Mohammad Aljammal
|
bb8ad61b95
|
Merge branch 'in_patient_services' into 'development'
Prescriptions for in patient
See merge request Cloud_Solution/doctor_app_flutter!534
|
5 years ago |
hussam al-habibeh
|
3e0f87527f
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into in_patient_services
|
5 years ago |
hussam al-habibeh
|
017074ba56
|
Prescriptions for in patient
|
5 years ago |
Elham Rababah
|
f2011301c6
|
update progress_note
|
5 years ago |
mosazaid
|
9aecc6fbdb
|
add lap results to inpatient and some changes on patient profile
|
5 years ago |
Sultan Khan
|
e445b5bb60
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
b52ba524a3
|
updated
|
5 years ago |
Elham Rababah
|
0909879ccf
|
Merge branches 'development' and 'progress_note' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into progress_note
|
5 years ago |
Elham Rababah
|
5199104d7a
|
show progress_note
|
5 years ago |
mosazaid
|
351c9b5e5c
|
Merge branch 'development' into in-patient-changes
# Conflicts:
# lib/config/localized_values.dart
# lib/screens/home/home_screen.dart
# lib/util/translations_delegate_base.dart
|
5 years ago |
mosazaid
|
b6a6f16b31
|
add vital sign inPatient
|
5 years ago |
mosazaid
|
37edd8cef9
|
add in-patient cards and header
|
5 years ago |
Sultan Khan
|
bf812a77de
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
360b4d22cf
|
in patient change
|
5 years ago |
Elham Rababah
|
e1eaab6a8e
|
fix medical profile_medical_info
|
5 years ago |
Elham Rababah
|
f4ce9eb004
|
Merge branches 'development' and 'radilology' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into radilology
|
5 years ago |
Elham Rababah
|
67abe2a5e7
|
first step from radiology
|
5 years ago |
Mohammad Aljammal
|
a95bb8be04
|
Merge branch 'sultan' into 'development'
Sultan
See merge request Cloud_Solution/doctor_app_flutter!529
|
5 years ago |
Sultan Khan
|
5afb44adfd
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Mohammad Aljammal
|
0260b92f24
|
Merge branch 'soap_refactor' into 'development'
Soap refactor
See merge request Cloud_Solution/doctor_app_flutter!528
|
5 years ago |
Sultan Khan
|
3aabb1537c
|
in patient
|
5 years ago |
hussam al-habibeh
|
240f70d163
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into code_reafactoring
Conflicts:
lib/screens/procedures/ProcedureCard.dart
|
5 years ago |
hussam al-habibeh
|
5bd50caa22
|
hot fixes
|
5 years ago |
Elham Rababah
|
bd01624f5a
|
create New order widget
|
5 years ago |
Elham Rababah
|
0c74bc4c60
|
Merge branches 'development' and 'soap_refactor' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into soap_refactor
|
5 years ago |
Elham Rababah
|
dcd1605649
|
add error Msg
|
5 years ago |
mosazaid
|
4b3c5b9f37
|
Merge branch 'development' into app-changes
|
5 years ago |
mosazaid
|
dde8d9aa48
|
design hot fixes
|
5 years ago |
hussam al-habibeh
|
6c3d681387
|
hot fixes
|
5 years ago |
Mohammad Aljammal
|
762fe14c37
|
Merge branch 'app-changes' into 'development'
hot fix
See merge request Cloud_Solution/doctor_app_flutter!525
|
5 years ago |
mosazaid
|
51234b8059
|
hot fix
|
5 years ago |
mosazaid
|
21ef5ee56a
|
hot fix
|
5 years ago |
Mohammad Aljammal
|
175168d56a
|
Merge branch 'app-changes' into 'development'
hot fix
See merge request Cloud_Solution/doctor_app_flutter!524
|
5 years ago |
mosazaid
|
6c3cb8cc94
|
hot fix
|
5 years ago |
mosazaid
|
54482bfb1d
|
hot fix
|
5 years ago |
Sultan Khan
|
6f52c9a7fd
|
fixe
|
5 years ago |
Elham Rababah
|
f8c6f13a11
|
small fix after merge
|
5 years ago |
mosazaid
|
74b0bac517
|
remove chart from procedure
|
5 years ago |
Sultan Khan
|
cacb619f02
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
hussam al-habibeh
|
89451a3c70
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into code_reafactoring
Conflicts:
lib/screens/medical-file/medical_file_page.dart
lib/screens/patients/profile/refer_patient_screen.dart
|
5 years ago |
Sultan Khan
|
4a8ae97518
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
0ea66c4483
|
bug fixes
|
5 years ago |
mosazaid
|
72bb64b460
|
finish working on app text widget
|
5 years ago |
mosazaid
|
8ae0a91c05
|
working on text widget
|
5 years ago |
hussam al-habibeh
|
17c878fa4c
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into code_reafactoring
Conflicts:
lib/screens/patients/profile/lab_result/lab_orders_screen.dart
lib/screens/patients/profile/refer_patient_screen.dart
|
5 years ago |
hussam al-habibeh
|
679ebe8fa6
|
Refacatoring Medical file
|
5 years ago |
mosazaid
|
bbe94d2b9b
|
Merge branch 'development' into design-fixes
# Conflicts:
# lib/screens/patients/profile/UCAF/UCAF-input-screen.dart
# lib/screens/patients/profile/admission-request/admission-request-first-screen.dart
# lib/screens/patients/profile/admission-request/admission-request-third-screen.dart
# lib/screens/patients/profile/admission-request/admission-request_second-screen.dart
# lib/screens/patients/profile/refer_patient_screen.dart
# lib/screens/patients/profile/referral/refer-patient-screen.dart
# lib/screens/patients/profile/soap_update/assessment/add_assessment_details.dart
# lib/screens/patients/profile/soap_update/plan/update_plan_page.dart
# lib/screens/patients/profile/soap_update/subjective/medication/add_medication.dart
# lib/screens/prescription/add_prescription_form.dart
# lib/screens/prescription/prescription_warnings.dart
# lib/widgets/auth/login_form.dart
# lib/widgets/shared/master_key_checkbox_search_allergies_widget.dart
|
5 years ago |
mosazaid
|
10baff8d59
|
button fixes
|
5 years ago |
Elham Rababah
|
b59bd0bd43
|
small fix in prescription_items_page
|
5 years ago |
Elham Rababah
|
7b7ce4e037
|
refactor utils folder
|
5 years ago |
hussam al-habibeh
|
ebe05226e9
|
Delteing unused file & refactoring routes page
|
5 years ago |
Elham Rababah
|
2a7daadead
|
fix after merge
|
5 years ago |
Elham Rababah
|
7579a21b83
|
Merge branches 'development' and 'soap_refactor' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into soap_refactor
Conflicts:
lib/widgets/auth/login_form.dart
|
5 years ago |
Elham Rababah
|
8220ef7700
|
add auto complete search
|
5 years ago |
mosazaid
|
af9bd53feb
|
Merge branch 'development' into design-fixes
# Conflicts:
# lib/widgets/auth/login_form.dart
|
5 years ago |
mosazaid
|
b8f6c35e75
|
working on buttons widgets
|
5 years ago |
Mohammad Aljammal
|
5560955bd7
|
Merge branch 'patient_app_services' into 'development'
fix pharmacies list
See merge request Cloud_Solution/doctor_app_flutter!519
|
5 years ago |
Mohammad Aljammal
|
ad0f159c98
|
Merge branch 'sultan' into 'development'
Sultan
See merge request Cloud_Solution/doctor_app_flutter!516
|
5 years ago |
Mohammad Aljammal
|
0e459de1a3
|
fix pharmacies list
|
5 years ago |
mosazaid
|
9f61c7eaa0
|
Merge branch 'design-fixes' into development
|
5 years ago |
mosazaid
|
65585ab586
|
add charts to procedures
|
5 years ago |
Elham Rababah
|
e73ca8af71
|
first step from change text fields
|
5 years ago |
Elham Rababah
|
59ec9d8e56
|
first step from change text fields
|
5 years ago |
Sultan Khan
|
f6e0e1b0cd
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
fda75c721d
|
bug fixes
|
5 years ago |
Mohammad Aljammal
|
fac8473f59
|
Merge branch 'design-fixes' into 'development'
lap result re-design
See merge request Cloud_Solution/doctor_app_flutter!515
|
5 years ago |
Mohammad Aljammal
|
43c254de05
|
Merge branch 'soap_refactor' into 'development'
Soap refactor
See merge request Cloud_Solution/doctor_app_flutter!513
|
5 years ago |
mosazaid
|
d543ce0f6f
|
lap result re-design
|
5 years ago |
Sultan Khan
|
878727fa7f
|
dashboard change
|
5 years ago |
Sultan Khan
|
4ed8f716db
|
dashboard changes
|
5 years ago |
Elham Rababah
|
2fd30ae1be
|
improve exam step
|
5 years ago |
Elham Rababah
|
042d4b4bfd
|
remove commented code
|
5 years ago |
Elham Rababah
|
4da72c81af
|
first step form code refactor
|
5 years ago |
Elham Rababah
|
76d411b79a
|
move soap folder to the correct place
|
5 years ago |
Elham Rababah
|
83ab0cff64
|
fix home
|
5 years ago |
Mohammad Aljammal
|
2d7b2003bd
|
hot fixes
|
5 years ago |
Mohammad Aljammal
|
90fdeb7893
|
add update page
|
5 years ago |
Mohammad Aljammal
|
f55bb4e60e
|
add update page
|
5 years ago |
Mohammad Aljammal
|
cb568d74c0
|
add fun back press on relay page
|
5 years ago |
Mohammad Aljammal
|
96d861ab81
|
Merge branch 'fix-issues' into 'development'
hot Fixes
See merge request Cloud_Solution/doctor_app_flutter!508
|
5 years ago |
Mohammad Aljammal
|
6fffc3f262
|
Merge branch 'textfield-validation' into 'development'
vitalsign fix error
See merge request Cloud_Solution/doctor_app_flutter!506
|
5 years ago |
hussam al-habibeh
|
369a5789a3
|
hot Fixe
|
5 years ago |
hussam al-habibeh
|
1bce2ad979
|
hot Fixes
|
5 years ago |
Mohammad Aljammal
|
7ab149a1cb
|
hot fix
|
5 years ago |
mosazaid
|
368ff27042
|
vitalsign fix error tet
|
5 years ago |
Mohammad Aljammal
|
f4d1aac5e6
|
hot fixes on doctor replay and schedule
|
5 years ago |
Mohammad Aljammal
|
255a13a918
|
Merge branch 'Stepper_header' into 'development'
add loader
See merge request Cloud_Solution/doctor_app_flutter!504
|
5 years ago |
Elham Rababah
|
221e0f7031
|
add loader
|
5 years ago |
Mohammad Aljammal
|
b4b86a7133
|
Merge branch 'Stepper_header' into 'development'
add doctor replay
See merge request Cloud_Solution/doctor_app_flutter!503
|
5 years ago |
Elham Rababah
|
f945861e1b
|
add doctor replay
|
5 years ago |
Mohammad Aljammal
|
d450affa37
|
Merge branch 'Stepper_header' into 'development'
add doctor replay
See merge request Cloud_Solution/doctor_app_flutter!502
|
5 years ago |
Elham Rababah
|
4ecf9fe4b9
|
add doctor replay
|
5 years ago |
mosazaid
|
8950dabf7a
|
Merge branch 'development' into textfield-validation
|
5 years ago |
mosazaid
|
4b32487540
|
referral design and service changes
|
5 years ago |
Mohammad Aljammal
|
94b7744dd0
|
Merge branch 'fix-issues' into 'development'
Hot Fixes
See merge request Cloud_Solution/doctor_app_flutter!500
|
5 years ago |
hussam al-habibeh
|
2e07e34c11
|
Hot Fixes
|
5 years ago |
Mohammad Aljammal
|
ffabb8883c
|
fix in the verification methods and radiology page
|
5 years ago |
Mohammad Aljammal
|
85a01edd5e
|
Merge branch 'textfield-validation' into 'development'
make referral changes
See merge request Cloud_Solution/doctor_app_flutter!498
|
5 years ago |
Mohammad Aljammal
|
b1234945e0
|
Merge branch 'fix-issues' into 'development'
Hot Fixes
See merge request Cloud_Solution/doctor_app_flutter!497
|
5 years ago |
mosazaid
|
82cbf392af
|
Merge branch 'development' into textfield-validation
|
5 years ago |
mosazaid
|
a701b6e989
|
make referral changes
|
5 years ago |
hussam al-habibeh
|
99ef89fa16
|
Hot Fixes
|
5 years ago |
Sultan Khan
|
91a499090b
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
649379d88f
|
bug fix
|
5 years ago |
Mohammad Aljammal
|
b6941d9f63
|
Merge branch 'Stepper_header' into 'development'
small fixes in soap and in all app.
See merge request Cloud_Solution/doctor_app_flutter!495
|
5 years ago |
Elham Rababah
|
2aba9e79f1
|
small fixes in soap and in all app.
|
5 years ago |
Sultan Khan
|
6f9069addc
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
8652c30a24
|
bug fix
|
5 years ago |
mosazaid
|
f626517f72
|
fix Helath summery bug
|
5 years ago |
Mohammad Aljammal
|
da084d889c
|
hot ECG,add a new button and hot fixes
|
5 years ago |
Sultan Khan
|
5aa4569c6b
|
bug fix
|
5 years ago |
Sultan Khan
|
20b31bde92
|
bug fix
|
5 years ago |
Mohammad Aljammal
|
b0bd37d991
|
Merge branch 'fix-issues' into 'development'
removing lookup list call in page opening
See merge request Cloud_Solution/doctor_app_flutter!489
|
5 years ago |
hussam al-habibeh
|
ff2f456b46
|
removing lookup list call in page opening
|
5 years ago |
Sultan Khan
|
6cc397f731
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
ffab532e94
|
bug fix
|
5 years ago |
Mohammad Aljammal
|
9fbb5f026b
|
Merge branch 'sultan' into 'development'
Sultan
See merge request Cloud_Solution/doctor_app_flutter!487
|
5 years ago |
Sultan Khan
|
9268b13312
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
5c4aee849e
|
bug fixes
|
5 years ago |
Mohammad Aljammal
|
c9e7119db2
|
Merge branch 'fix-issues' into 'development'
removing medication list from model ready
See merge request Cloud_Solution/doctor_app_flutter!486
|
5 years ago |
hussam al-habibeh
|
caec2f5a88
|
removing medication list from model ready
|
5 years ago |
Mohammad Aljammal
|
a39de65b24
|
Merge branch 'fix-issues' into 'development'
removing medication list from model ready
See merge request Cloud_Solution/doctor_app_flutter!485
|
5 years ago |
hussam al-habibeh
|
b697d924c5
|
removing medication list from model ready
|
5 years ago |
Mohammad Aljammal
|
8ed9b3c023
|
Merge branch 'Stepper_header' into 'development'
Stepper header
See merge request Cloud_Solution/doctor_app_flutter!484
|
5 years ago |
Sultan Khan
|
148ea967fb
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |