Elham Rababah
|
7bc897bf39
|
fix profile issue
|
5 years ago |
Mohammad Aljammal
|
82544cb2e7
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referral_in_patient
Conflicts:
lib/client/base_app_client.dart
|
5 years ago |
Mohammad Aljammal
|
989774a0b3
|
Fix patient card and add the discharged in Patient referral page
|
5 years ago |
hussam al-habibeh
|
c24bb604d4
|
DashBoard design fix
|
5 years ago |
Elham Rababah
|
d5d57e7997
|
fix new design issue
|
5 years ago |
Mohammad Aljammal
|
27a3dd1eb4
|
fix the filter page
|
5 years ago |
Mohammad Aljammal
|
b1f1b7e34d
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referral_in_patient
Conflicts:
lib/screens/patients/profile/lab_result/labs_home_page.dart
lib/screens/patients/profile/radiology/radiology_home_page.dart
|
5 years ago |
Mohammad Aljammal
|
ed3449bcf4
|
fix the doctor card in lab result and radiology
|
5 years ago |
Mohammad Aljammal
|
04be0a7fc6
|
Merge branch 'add_out_patient_filter' into 'development'
Add out patient filter
See merge request Cloud_Solution/doctor_app_flutter!620
|
5 years ago |
Elham Rababah
|
fe581ae7ce
|
remove button height
|
5 years ago |
hussam al-habibeh
|
b5bebea932
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into app_translation
Conflicts:
lib/config/localized_values.dart
lib/util/translations_delegate_base.dart
|
5 years ago |
hussam al-habibeh
|
c86a3dabda
|
page translation
|
5 years ago |
Elham Rababah
|
dcdbe76e54
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_issus_soap
Conflicts:
lib/screens/patients/profile/patient_profile_screen.dart
|
5 years ago |
Elham Rababah
|
0f8820fa44
|
fix profile screen and start the first step from filter page
|
5 years ago |
mosazaid
|
68f405cb21
|
design fixes
|
5 years ago |
mosazaid
|
55895496e1
|
Merge branch 'design-changes' into development
|
5 years ago |
mosazaid
|
3d6b55681a
|
fix arabic and font style
|
5 years ago |
Elham Rababah
|
30bc9b4bea
|
fix issue
|
5 years ago |
Mohammad Aljammal
|
1dd668ed70
|
hot fixes
|
5 years ago |
Elham Rababah
|
72bf5d2337
|
fix scrolling in patient screen
|
5 years ago |
Elham Rababah
|
acb1bdbb37
|
fix
|
5 years ago |
Mohammad Aljammal
|
dc9f75f0ca
|
hot fixes
|
5 years ago |
Mohammad Aljammal
|
60eb7adab1
|
hot fixes
|
5 years ago |
Mohammad Aljammal
|
c3ac50a859
|
hot fixes
|
5 years ago |
Mohammad Aljammal
|
85288cc014
|
Add filter in outpatient
|
5 years ago |
Mohammad Aljammal
|
3af47304b3
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referral_in_patient
|
5 years ago |
Mohammad Aljammal
|
8d652372ff
|
Merge branch 'search_out_patient' into 'development'
Search out patient
See merge request Cloud_Solution/doctor_app_flutter!598
|
5 years ago |
Mohammad Aljammal
|
3927c40d7e
|
Fix Patient Profile
|
5 years ago |
Elham Rababah
|
403fece008
|
commit things
|
5 years ago |
Mohammad Aljammal
|
cab9cddef0
|
Merge branch 'in_patient_services' into 'development'
Search Profile Patient update
See merge request Cloud_Solution/doctor_app_flutter!596
|
5 years ago |
Zohaib Iqbal Kambrani
|
4b7688d620
|
showDailog Migration
DateUtils Conflict with Material (DateUtils -> AppDateUtils)
|
5 years ago |
hussam al-habibeh
|
975260df2a
|
Search Profile Patient update
|
5 years ago |
Elham Rababah
|
56a5209d92
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into search_out_patient
Conflicts:
lib/core/model/PatientSearchRequestModel.dart
lib/core/viewModel/PatientSearchViewModel.dart
lib/locator.dart
|
5 years ago |
mosazaid
|
40c0f9f4a0
|
Merge branch 'development' into in-patient_re-design
|
5 years ago |
mosazaid
|
3e24278d89
|
in-patient re-design
|
5 years ago |
Mohammad Aljammal
|
357e01c846
|
hot fixes
|
5 years ago |
Elham Rababah
|
c062a14cc2
|
Merge branches 'development' and 'search_out_patient' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into search_out_patient
|
5 years ago |
Elham Rababah
|
cb67dcc9e1
|
first step from search
|
5 years ago |
Mohammad Aljammal
|
55c63c9531
|
fix Discharged Patient
|
5 years ago |
Mohammad Aljammal
|
57d22aca13
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referral_in_patient
|
5 years ago |
Mohammad Aljammal
|
c9c18efd72
|
add in lab result get in and out patient
|
5 years ago |
Mohammad Aljammal
|
d18ca12aac
|
Merge branch 'sultan' into 'development'
Sultan
See merge request Cloud_Solution/doctor_app_flutter!587
|
5 years ago |
Sultan Khan
|
099bf81d52
|
homepage and sms popup updated
|
5 years ago |
mosazaid
|
ddc266416d
|
some functionality and design changes
|
5 years ago |
Mohammad Aljammal
|
f708689d00
|
hot fixes
|
5 years ago |
Sultan Khan
|
bbdbc3cc25
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
045584bb28
|
voice feature added
|
5 years ago |
Mohammad Aljammal
|
29e2d962bc
|
Optimize imports
|
5 years ago |
Mohammad Aljammal
|
b2bcb3dd6d
|
Done Referral Discharged Patient
|
5 years ago |
mosazaid
|
5003b3a001
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
|
5 years ago |
mosazaid
|
1b8e3eb895
|
some fixes
|
5 years ago |
Mohammad Aljammal
|
a8dc3a8933
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referral_in_patient
Conflicts:
lib/screens/patients/profile/note/progress_note_screen.dart
|
5 years ago |
Mohammad Aljammal
|
127bc16415
|
Merge branch 'in_patient_services' into 'development'
medical file hot fix
See merge request Cloud_Solution/doctor_app_flutter!572
|
5 years ago |
Mohammad Aljammal
|
460a5293b9
|
add Discharged Patient
|
5 years ago |
hussam al-habibeh
|
0e836c67c8
|
medical file hot fix
|
5 years ago |
Mohammad Aljammal
|
6f6e2d3397
|
Merge branch 'progress_note' into 'development'
fix progress_note issue
See merge request Cloud_Solution/doctor_app_flutter!571
|
5 years ago |
Elham Rababah
|
89f29d5de7
|
fix progress_note issue
|
5 years ago |
Sultan Khan
|
872e9cd0bd
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
648f6fd7cb
|
bug fix
|
5 years ago |
Mohammad Aljammal
|
cf4d2c6cb7
|
Merge branch 'progress_note' into 'development'
fix radiology_service
See merge request Cloud_Solution/doctor_app_flutter!565
|
5 years ago |
Mohammad Aljammal
|
0ab78827e3
|
Merge branch 'fridayf-fix-bug' into 'development'
finish in-patient referral
See merge request Cloud_Solution/doctor_app_flutter!563
|
5 years ago |
Elham Rababah
|
723b4326ca
|
add sick leave to inpatient
|
5 years ago |
Sultan Khan
|
acf74ab9fc
|
bug fix
|
5 years ago |
mosazaid
|
a34db1b00c
|
Merge branch 'development' into fridayf-fix-bug
# Conflicts:
# lib/util/translations_delegate_base.dart
|
5 years ago |
mosazaid
|
42d8fc0207
|
finish in-patient referral
|
5 years ago |
Sultan Khan
|
94806c3601
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
19f0d7ede9
|
voice feature added
|
5 years ago |
Mohammad Aljammal
|
61d5f886ed
|
Merge branch 'progress_note' into 'development'
Progress note
See merge request Cloud_Solution/doctor_app_flutter!560
|
5 years ago |
Elham Rababah
|
23cb01daf5
|
prevent add spaces
|
5 years ago |
Elham Rababah
|
2d4cb00716
|
fix design issue
|
5 years ago |
Mohammad Aljammal
|
6d530301b6
|
done first page in ReferralInPatient
|
5 years ago |
mosazaid
|
9d00440789
|
referral -re design
|
5 years ago |
Sultan Khan
|
dad5aeb262
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
c9150ef088
|
bug fixes
|
5 years ago |
Mohammad Aljammal
|
1d2ee1284e
|
fix issues on Referral
|
5 years ago |
Mohammad Aljammal
|
3127a09ecf
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services
|
5 years ago |
Mohammad Aljammal
|
704a4bd0be
|
hot fixes
|
5 years ago |
mosazaid
|
596f518525
|
Merge branch 'development' into release-hot-fix
# Conflicts:
# lib/screens/patients/profile/patient_profile_screen.dart
# lib/widgets/patients/profile/PatientProfileButton.dart
# lib/widgets/patients/profile/profile_medical_info_widget.dart
|
5 years ago |
mosazaid
|
bf9ce4694f
|
fix logic
|
5 years ago |
Elham Rababah
|
b2a2884586
|
Merge branches 'development' and 'progress_note' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into progress_note
Conflicts:
lib/screens/patients/profile/radiology/radiology_home_page.dart
|
5 years ago |
hussam al-habibeh
|
1d09bcf251
|
hot fixes
|
5 years ago |
Elham Rababah
|
d4ddfa21e5
|
add the new logic
|
5 years ago |
Mohammad Aljammal
|
c924ea667f
|
hot fixes
|
5 years ago |
Sultan Khan
|
c5f12ca307
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
e83032e725
|
patient card
|
5 years ago |
Mohammad Aljammal
|
349c63f4ce
|
Merge branch 'in-patient-changes' into 'development'
hoh design fixes
See merge request Cloud_Solution/doctor_app_flutter!543
|
5 years ago |
Sultan Khan
|
426aa03aa5
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
b5503a8411
|
fixes
|
5 years ago |
mosazaid
|
09f87a6cbd
|
Merge branch 'development' into in-patient-changes
# Conflicts:
# lib/screens/patients/profile/lab_result/LabResultWidget.dart
|
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 |
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
|
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 |
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 |
Sultan Khan
|
3aabb1537c
|
in patient
|
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 |
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 |
Sultan Khan
|
6f52c9a7fd
|
fixe
|
5 years ago |
Sultan Khan
|
cacb619f02
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
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 |
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
|
7b7ce4e037
|
refactor utils folder
|
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 |