Elham Rababah
|
d8f27f6a98
|
add speech to text
|
6 years ago |
|
Elham Rababah
|
b1fc59aa0f
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into progress_note
|
6 years ago |
Mohammad Aljammal
|
89e0107b86
|
Merge branch 'referral_in_patient' into 'development'
Referral in patient
See merge request Cloud_Solution/doctor_app_flutter!566
|
6 years ago |
|
Elham Rababah
|
09d2cbead5
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into progress_note
|
6 years ago |
|
Elham Rababah
|
c0d568070c
|
add icon
|
6 years ago |
Mohammad Aljammal
|
9b7bb687c8
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referral_in_patient
|
6 years ago |
|
Mohammad Aljammal
|
cf4d2c6cb7
|
Merge branch 'progress_note' into 'development'
fix radiology_service
See merge request Cloud_Solution/doctor_app_flutter!565
|
6 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
|
6 years ago |
|
Elham Rababah
|
220ea803ff
|
Merge branches 'development' and 'progress_note' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into progress_note
|
6 years ago |
|
Mohammad Aljammal
|
5811a39a9c
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referral_in_patient
|
6 years ago |
Sultan Khan
|
3e9c93e0cd
|
sick leave
|
6 years ago |
|
Elham Rababah
|
723b4326ca
|
add sick leave to inpatient
|
6 years ago |
mosazaid
|
3074dfd42e
|
hot fix
|
6 years ago |
|
Elham Rababah
|
84ec110c82
|
fix radiology_service
|
6 years ago |
|
Sultan Khan
|
9e87c63d22
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
6 years ago |
|
Sultan Khan
|
acf74ab9fc
|
bug fix
|
6 years ago |
|
mosazaid
|
a34db1b00c
|
Merge branch 'development' into fridayf-fix-bug
# Conflicts:
# lib/util/translations_delegate_base.dart
|
6 years ago |
|
mosazaid
|
42d8fc0207
|
finish in-patient referral
|
6 years ago |
|
Mohammad Aljammal
|
1cfc970051
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referral_in_patient
|
6 years ago |
|
Mohammad Aljammal
|
d14659d2b7
|
Merge branch 'sultan' into 'development'
Sultan
See merge request Cloud_Solution/doctor_app_flutter!562
|
6 years ago |
|
Mohammad Aljammal
|
3c224ece41
|
Add replay on referral patient and add the time on the vital signs
|
6 years ago |
|
Sultan Khan
|
94806c3601
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
6 years ago |
|
Sultan Khan
|
19f0d7ede9
|
voice feature added
|
6 years ago |
|
Elham Rababah
|
9c2f4e6adb
|
finally fix updating state issue
|
6 years ago |
|
Elham Rababah
|
66806ae8f1
|
Merge branches 'development' and 'progress_note' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into progress_note
|
6 years ago |
|
Elham Rababah
|
98e0e1f078
|
return note back
|
6 years ago |
|
Mohammad Aljammal
|
61d5f886ed
|
Merge branch 'progress_note' into 'development'
Progress note
See merge request Cloud_Solution/doctor_app_flutter!560
|
6 years ago |
|
Elham Rababah
|
8f871898b8
|
return config back
|
6 years ago |
|
Elham Rababah
|
23cb01daf5
|
prevent add spaces
|
6 years ago |
|
Elham Rababah
|
4a6503c2cf
|
fix design issue
|
6 years ago |
|
Elham Rababah
|
2d4cb00716
|
fix design issue
|
6 years ago |
|
mosazaid
|
6eb12b011f
|
Merge branch 'development' into fridayf-fix-bug
|
6 years ago |
|
mosazaid
|
d9f9c3e36e
|
REFERRAL DESIGN
|
6 years ago |
|
Mohammad Aljammal
|
7ed64c9007
|
Merge branch 'referral_in_patient' into 'development'
done first page in ReferralInPatient
See merge request Cloud_Solution/doctor_app_flutter!559
|
6 years ago |
|
Mohammad Aljammal
|
eec640efe8
|
Merge branch 'in_patient_services' into 'development'
hot fix
See merge request Cloud_Solution/doctor_app_flutter!558
|
6 years ago |
|
Mohammad Aljammal
|
5333c0730b
|
Merge branch 'progress_note' into 'development'
Progress note
See merge request Cloud_Solution/doctor_app_flutter!557
|
6 years ago |
|
Mohammad Aljammal
|
6d530301b6
|
done first page in ReferralInPatient
|
6 years ago |
hussam al-habibeh
|
714c569a13
|
hot fix
|
6 years ago |
|
Elham Rababah
|
fceb351b6c
|
fix the progress_note_screen
|
6 years ago |
|
mosazaid
|
9d00440789
|
referral -re design
|
6 years ago |
|
Elham Rababah
|
9e31cf5379
|
first step from modification
|
6 years ago |
|
mosazaid
|
976da1e935
|
Merge branch 'development' into fridayf-fix-bug
|
6 years ago |
|
mosazaid
|
d06cf27724
|
vital-sign- fixes
|
6 years ago |
|
Sultan Khan
|
dad5aeb262
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
6 years ago |
|
Sultan Khan
|
c9150ef088
|
bug fixes
|
6 years ago |
|
Mohammad Aljammal
|
1d2ee1284e
|
fix issues on Referral
|
6 years ago |
|
Mohammad Aljammal
|
8a63d8bb83
|
hot fixes
|
6 years ago |
|
Mohammad Aljammal
|
3127a09ecf
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services
|
6 years ago |
|
Mohammad Aljammal
|
704a4bd0be
|
hot fixes
|
6 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
|
6 years ago |
|
mosazaid
|
bf9ce4694f
|
fix logic
|
6 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
|
6 years ago |
|
hussam al-habibeh
|
1d09bcf251
|
hot fixes
|
6 years ago |
|
Elham Rababah
|
d4ddfa21e5
|
add the new logic
|
6 years ago |
|
Mohammad Aljammal
|
c924ea667f
|
hot fixes
|
6 years ago |
|
Sultan Khan
|
c5f12ca307
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
6 years ago |
|
Sultan Khan
|
e83032e725
|
patient card
|
6 years ago |
|
Mohammad Aljammal
|
6007421629
|
Merge branch 'patient_app_services' into 'development'
Patient app services
See merge request Cloud_Solution/doctor_app_flutter!547
|
6 years ago |
|
Mohammad Aljammal
|
0ded3a5a03
|
hot fixes
|
6 years ago |
|
Mohammad Aljammal
|
349c63f4ce
|
Merge branch 'in-patient-changes' into 'development'
hoh design fixes
See merge request Cloud_Solution/doctor_app_flutter!543
|
6 years ago |
|
Mohammad Aljammal
|
1711f6482d
|
Merge branch 'in_patient_services' into 'development'
small update in procedure
See merge request Cloud_Solution/doctor_app_flutter!544
|
6 years ago |
|
Mohammad Aljammal
|
9e8aef0835
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services
|
6 years ago |
|
Mohammad Aljammal
|
8350d68397
|
Merge branch 'progress_note' into 'development'
add condition
See merge request Cloud_Solution/doctor_app_flutter!545
|
6 years ago |
|
Mohammad Aljammal
|
414ccdde49
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services
|
6 years ago |
|
Mohammad Aljammal
|
b37c607813
|
done the referral service
|
6 years ago |
|
Sultan Khan
|
426aa03aa5
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
6 years ago |
|
Sultan Khan
|
b5503a8411
|
fixes
|
6 years ago |
|
mosazaid
|
09f87a6cbd
|
Merge branch 'development' into in-patient-changes
# Conflicts:
# lib/screens/patients/profile/lab_result/LabResultWidget.dart
|
6 years ago |
|
Elham Rababah
|
79037d8fc7
|
add condition
|
6 years ago |
|
hussam al-habibeh
|
c7275a3106
|
small update in procedure
|
6 years ago |
|
mosazaid
|
d78a3e168e
|
hoh design fixes
|
6 years ago |
|
Mohammad Aljammal
|
650a949c6a
|
Merge branch 'progress_note' into 'development'
Progress note
See merge request Cloud_Solution/doctor_app_flutter!542
|
6 years ago |
|
Elham Rababah
|
9d780f72b4
|
remove commented code
|
6 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
|
6 years ago |
|
Mohammad Aljammal
|
ae8882fbae
|
Merge branch 'in-patient-changes' into 'development'
In patient changes
See merge request Cloud_Solution/doctor_app_flutter!539
|
6 years ago |
|
Elham Rababah
|
8d7fef3db9
|
fix some issue on progress_note_screen
|
6 years ago |
|
hussam al-habibeh
|
0e65b743e3
|
Insurance Approval In Patient
|
6 years ago |
|
mosazaid
|
78f2ab5ae3
|
design fixes
|
6 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
|
6 years ago |
|
hussam al-habibeh
|
94e598c5f2
|
Insurance Approval In Patient
|
6 years ago |
|
mosazaid
|
2bf003c100
|
Merge branch 'development' into in-patient-changes
|
6 years ago |
|
mosazaid
|
33545d1180
|
work on in paitent referral
|
6 years ago |
|
Mohammad Aljammal
|
fd790978c4
|
add new referral service
|
6 years ago |
|
Sultan Khan
|
608198762d
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
6 years ago |
|
Sultan Khan
|
d0a39ca3d4
|
fixes
|
6 years ago |
|
Elham Rababah
|
acc3ecdbbe
|
cancel progress_note part
|
6 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
|
6 years ago |
|
Elham Rababah
|
82285ccf39
|
show progress_note part
|
6 years ago |
|
Mohammad Aljammal
|
e4aae762cc
|
Merge branch 'in-patient-changes' into 'development'
In patient changes
See merge request Cloud_Solution/doctor_app_flutter!536
|
6 years ago |
|
mosazaid
|
34e9a3797c
|
Merge branch 'development' into in-patient-changes
|
6 years ago |
|
Sultan Khan
|
822dc7da77
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
6 years ago |
|
Sultan Khan
|
feef001323
|
bug fixes
|
6 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
|
6 years ago |
|
hussam al-habibeh
|
3e0f87527f
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into in_patient_services
|
6 years ago |
|
hussam al-habibeh
|
017074ba56
|
Prescriptions for in patient
|
6 years ago |
|
Elham Rababah
|
f2011301c6
|
update progress_note
|
6 years ago |
|
mosazaid
|
9aecc6fbdb
|
add lap results to inpatient and some changes on patient profile
|
6 years ago |
|
Sultan Khan
|
e445b5bb60
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
6 years ago |
|
Sultan Khan
|
b52ba524a3
|
updated
|
6 years ago |
|
Elham Rababah
|
0909879ccf
|
Merge branches 'development' and 'progress_note' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into progress_note
|
6 years ago |
|
Elham Rababah
|
5199104d7a
|
show progress_note
|
6 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
|
6 years ago |
|
mosazaid
|
b6a6f16b31
|
add vital sign inPatient
|
6 years ago |
|
mosazaid
|
37edd8cef9
|
add in-patient cards and header
|
6 years ago |
|
Sultan Khan
|
bf812a77de
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
6 years ago |
|
Sultan Khan
|
360b4d22cf
|
in patient change
|
6 years ago |
|
Elham Rababah
|
e1eaab6a8e
|
fix medical profile_medical_info
|
6 years ago |
|
Elham Rababah
|
f4ce9eb004
|
Merge branches 'development' and 'radilology' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into radilology
|
6 years ago |
|
Elham Rababah
|
67abe2a5e7
|
first step from radiology
|
6 years ago |
|
Mohammad Aljammal
|
a95bb8be04
|
Merge branch 'sultan' into 'development'
Sultan
See merge request Cloud_Solution/doctor_app_flutter!529
|
6 years ago |
|
Sultan Khan
|
5afb44adfd
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
6 years ago |
|
Mohammad Aljammal
|
0260b92f24
|
Merge branch 'soap_refactor' into 'development'
Soap refactor
See merge request Cloud_Solution/doctor_app_flutter!528
|
6 years ago |
|
Sultan Khan
|
3aabb1537c
|
in patient
|
6 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
|
6 years ago |
|
hussam al-habibeh
|
5bd50caa22
|
hot fixes
|
6 years ago |
|
Elham Rababah
|
bd01624f5a
|
create New order widget
|
6 years ago |
|
Elham Rababah
|
0c74bc4c60
|
Merge branches 'development' and 'soap_refactor' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into soap_refactor
|
6 years ago |
|
Elham Rababah
|
dcd1605649
|
add error Msg
|
6 years ago |
|
mosazaid
|
4b3c5b9f37
|
Merge branch 'development' into app-changes
|
6 years ago |
|
mosazaid
|
dde8d9aa48
|
design hot fixes
|
6 years ago |
|
hussam al-habibeh
|
6c3d681387
|
hot fixes
|
6 years ago |
|
Mohammad Aljammal
|
762fe14c37
|
Merge branch 'app-changes' into 'development'
hot fix
See merge request Cloud_Solution/doctor_app_flutter!525
|
6 years ago |
|
mosazaid
|
51234b8059
|
hot fix
|
6 years ago |
|
mosazaid
|
21ef5ee56a
|
hot fix
|
6 years ago |
|
Mohammad Aljammal
|
175168d56a
|
Merge branch 'app-changes' into 'development'
hot fix
See merge request Cloud_Solution/doctor_app_flutter!524
|
6 years ago |
|
mosazaid
|
6c3cb8cc94
|
hot fix
|
6 years ago |
|
mosazaid
|
54482bfb1d
|
hot fix
|
6 years ago |
|
Sultan Khan
|
6f52c9a7fd
|
fixe
|
6 years ago |
|
Elham Rababah
|
f8c6f13a11
|
small fix after merge
|
6 years ago |
|
mosazaid
|
74b0bac517
|
remove chart from procedure
|
6 years ago |
|
Sultan Khan
|
cacb619f02
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
6 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
|
6 years ago |
|
Sultan Khan
|
4a8ae97518
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
6 years ago |
|
Sultan Khan
|
0ea66c4483
|
bug fixes
|
6 years ago |
|
mosazaid
|
72bb64b460
|
finish working on app text widget
|
6 years ago |
|
mosazaid
|
8ae0a91c05
|
working on text widget
|
6 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
|
6 years ago |
|
hussam al-habibeh
|
679ebe8fa6
|
Refacatoring Medical file
|
6 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
|
6 years ago |
|
mosazaid
|
10baff8d59
|
button fixes
|
6 years ago |
|
Elham Rababah
|
b59bd0bd43
|
small fix in prescription_items_page
|
6 years ago |
|
Elham Rababah
|
7b7ce4e037
|
refactor utils folder
|
6 years ago |
|
hussam al-habibeh
|
ebe05226e9
|
Delteing unused file & refactoring routes page
|
6 years ago |
|
Elham Rababah
|
2a7daadead
|
fix after merge
|
6 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
|
6 years ago |
|
Elham Rababah
|
8220ef7700
|
add auto complete search
|
6 years ago |
|
mosazaid
|
af9bd53feb
|
Merge branch 'development' into design-fixes
# Conflicts:
# lib/widgets/auth/login_form.dart
|
6 years ago |
|
mosazaid
|
b8f6c35e75
|
working on buttons widgets
|
6 years ago |
|
Mohammad Aljammal
|
5560955bd7
|
Merge branch 'patient_app_services' into 'development'
fix pharmacies list
See merge request Cloud_Solution/doctor_app_flutter!519
|
6 years ago |
|
Mohammad Aljammal
|
ad0f159c98
|
Merge branch 'sultan' into 'development'
Sultan
See merge request Cloud_Solution/doctor_app_flutter!516
|
6 years ago |