Elham Rababah
|
c10a0cf88e
|
hot fix profile_medical_info_widget_search
|
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
|
7d85c8b692
|
return back the condition
|
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 |
Elham Rababah
|
4190f32cdb
|
return radiology and insurance approval
|
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 |
Elham Rababah
|
1843acbcb1
|
Merge branches 'development' and 'patinet_profile_with_all_service' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patinet_profile_with_all_service
|
5 years ago |
Elham Rababah
|
4d6795fcc0
|
show all services for all type of patient.
|
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
|
cf44e6f77a
|
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 |
Elham Rababah
|
bedf6e7bbe
|
fix DA-346
|
5 years ago |
Elham Rababah
|
74e408f2d1
|
Merge branches 'add_medication_details' and 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into add_medication_details
|
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
|
12b78d0a3b
|
fix DA-391: return back my comment code in base app client
|
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
|
d3ffa31261
|
Merge branch 'sultan' into 'development'
Sultan
See merge request Cloud_Solution/doctor_app_flutter!322
|
5 years ago |
Elham Rababah
|
f819e6353e
|
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 |
Sultan Khan
|
63d73b60e1
|
ios faceid issue
|
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
|
0f15732728
|
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 |
Sultan Khan
|
958a341c3b
|
sick leave
|
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
|
083b49aa0a
|
fix DA-341
|
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 |
Mohammad Aljammal
|
ba8ecf04bf
|
Merge branch 'done_button_keyboard' into 'development'
hide the keyboard when the user click on background
See merge request Cloud_Solution/doctor_app_flutter!308
|
5 years ago |
Mohammad Aljammal
|
62d45d4e1c
|
hide the keyboard when the user click on background
|
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 |
Elham Rababah
|
ff33afd124
|
fix DA-149
|
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 |
Elham Rababah
|
753ef3bfb0
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_issues
|
5 years ago |
Elham Rababah
|
a5a7425a09
|
fix DA-149
|
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
|
98609b464b
|
fix DA-279
|
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
|
d78aa2321d
|
bug fix
|
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 |
Elham Rababah
|
7505a6b6b0
|
fix allergy
|
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 |
Elham Rababah
|
6a5e134527
|
fix remark and step widget
|
5 years ago |
hussam al-habibeh
|
23c826b37f
|
bug fix
|
5 years ago |
Elham Rababah
|
cfb9ea30cb
|
fix : DA-335
|
5 years ago |
Mohammad Aljammal
|
8f9e799070
|
Merge branch 'feature-ucaf' into 'development'
Feature ucaf
See merge request Cloud_Solution/doctor_app_flutter!287
|
5 years ago |
Elham Rababah
|
2b07d16f00
|
fix : DA-303
|
5 years ago |
Elham Rababah
|
f84902b73b
|
fix : DA-333
|
5 years ago |
Elham Rababah
|
e652752729
|
fix : DA-334
|
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 |
mosazaid
|
e74de0b475
|
Merge branch 'development' into feature-ucaf
|
5 years ago |
mosazaid
|
b63c7aff25
|
Fix DA-331 vital signs uncorrect temperature value
|
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 |
Mohammad Aljammal
|
8b992b4189
|
Merge branch 'development' into 'fix_issues'
# Conflicts:
# lib/config/localized_values.dart
|
5 years ago |
Elham Rababah
|
494479f1d9
|
fix : DA-264 fix merge error
|
5 years ago |
Elham Rababah
|
437ae3dfb5
|
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 |
Elham Rababah
|
febdadc924
|
fix : DA-264
|
5 years ago |
Elham Rababah
|
34692b94c2
|
fix : DA-264
|
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 |
Elham Rababah
|
b9b5ec09e4
|
fix : DA-248
|
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
|
abcd7e9833
|
Merge branch 'fix_issues' into 'development'
remark fix in allergies
See merge request Cloud_Solution/doctor_app_flutter!280
|
5 years ago |
Elham Rababah
|
6820e2d097
|
remark fix in allergies
|
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 |
Mohammad Aljammal
|
fa94b60711
|
Merge branch 'feature-ucaf' into 'development'
translation
See merge request Cloud_Solution/doctor_app_flutter!278
|
5 years ago |
Mohammad Aljammal
|
3cfb88b313
|
Merge branch 'sultan' into 'development'
Sultan
See merge request Cloud_Solution/doctor_app_flutter!277
|
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 |
Sultan Khan
|
ed3b42d721
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
d34744e168
|
bug fix
|
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
|
c065dbbdb3
|
Fixed DA:266
|
5 years ago |
Elham Rababah
|
913ffc3052
|
Fix DA-260,DA-267
|
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 |
Sultan Khan
|
b92bc85e8f
|
bug fixes
|
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 |
Elham Rababah
|
484c737836
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_issues
|
5 years ago |
Mohammad Aljammal
|
35a9f34b18
|
Merge branch 'development' into 'sultan'
# Conflicts:
# lib/widgets/patients/profile/profile_medical_info_widget.dart
|
5 years ago |
Mohammad Aljammal
|
b89af8a5ab
|
Merge branch 'feature-ucaf' into 'development'
Feature ucaf
See merge request Cloud_Solution/doctor_app_flutter!266
|
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 |
Elham Rababah
|
f0cd33ae43
|
fix issue on assessment design
|
5 years ago |
Elham Rababah
|
1de25aae2f
|
fix issue on assessment design
|
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 |
hussam al-habibeh
|
38d9881ed2
|
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 |
mosazaid
|
5440fd1ef9
|
Merge branch 'development' into feature-ucaf
|
5 years ago |
mosazaid
|
3be693337a
|
some fixes
|
5 years ago |
Elham Rababah
|
4e4e6a3600
|
fix DA-151
|
5 years ago |
Elham Rababah
|
a7ca7fb271
|
fix DA-151
|
5 years ago |
hussam al-habibeh
|
ced4edebde
|
patinet profile update
|
5 years ago |
Elham Rababah
|
03fa9de901
|
fix DA-198
|
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 |
Elham Rababah
|
cc92fe56c6
|
fix DA-154,DA-150
|
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
|
e95638bd99
|
fix DA-157
|
5 years ago |
Elham Rababah
|
e9de8a72e9
|
fix DA-152
|
5 years ago |
Elham Rababah
|
855ed0ac12
|
fix 145
|
5 years ago |
Elham Rababah
|
02167afa6b
|
fix 143,144
|
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 |
Elham Rababah
|
eb90fc0161
|
fix bug in assessment
|
5 years ago |
Sultan Khan
|
40cfad7f7b
|
login
|
5 years ago |
Elham Rababah
|
9674eb89d9
|
add modification on so
|
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
|
1fa52e0394
|
medical dile & Order Procedure translation
|
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
|
306d484837
|
Merge branch 'development' into feature-ucaf
|
5 years ago |
mosazaid
|
8726653ffb
|
working on Referral feature
|
5 years ago |
Mohammad Aljammal
|
cc14448d48
|
Merge branch 'soap_update' into 'development'
fix loader in login
See merge request Cloud_Solution/doctor_app_flutter!247
|
5 years ago |
Elham Rababah
|
1f2aebde33
|
fix loader in login
|
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 |
mosazaid
|
db502b7f0d
|
Merge branch 'development' into feature-ucaf
|
5 years ago |
mosazaid
|
421cee49c7
|
Merge branch 'feature-ucaf' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into feature-ucaf
# Conflicts:
# lib/config/localized_values.dart
# lib/util/translations_delegate_base.dart
|
5 years ago |
mosazaid
|
97d05c72c2
|
Merge branch 'development' into feature-ucaf
# Conflicts:
# lib/config/localized_values.dart
# lib/util/translations_delegate_base.dart
|
5 years ago |
Mohammad Aljammal
|
748802af1d
|
Merge branch 'soap_update' into 'development'
Soap update
See merge request Cloud_Solution/doctor_app_flutter!245
|
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 Rababah
|
3c1b51eb94
|
fix issue related to landing page
|
5 years ago |
Elham Rababah
|
90a16676db
|
fix issue related to SOAP
|
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 |
Elham Rababah
|
0147e7e49b
|
do translation, fix some bugs
|
5 years ago |
Elham Rababah
|
175ba545e7
|
finish create episode
|
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
|
ca9f1a022b
|
Merge branch 'development' into feature-ucaf
# Conflicts:
# lib/config/localized_values.dart
# lib/util/translations_delegate_base.dart
|
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 |
Elham
|
8494f6e0f4
|
Merge branch 'soap_update' into 'development'
Soap update
See merge request Cloud_Solution/doctor_app_flutter!241
|
5 years ago |
Elham Rababah
|
caddbdb53c
|
small fixes in progress note
|
5 years ago |
Elham Rababah
|
34b7b4564c
|
assessment work fine now
|
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 |
Elham Rababah
|
a46a61c5cf
|
fix get and post issue to make it works with vida
|
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 |
Elham Rababah
|
7ce1d2dd55
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into soap_update
Conflicts:
lib/config/localized_values.dart
lib/util/translations_delegate_base.dart
|
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 |
Elham Rababah
|
9aa5ab4228
|
small changes
|
5 years ago |
hussam al-habibeh
|
f997561bb8
|
drug list
|
5 years ago |
Elham Rababah
|
1be8ea7dcb
|
Fix conflict
|
5 years ago |
Elham Rababah
|
ffe7e7c57f
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into soap_update
Conflicts:
lib/config/localized_values.dart
lib/util/translations_delegate_base.dart
|
5 years ago |
Elham Rababah
|
c3bb408787
|
add some translations
|
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 |
Elham Rababah
|
bbcd218a94
|
history delete is fixed
|
5 years ago |
mosazaid
|
2f9d4a1034
|
Merge branch 'development' into feature-ucaf
|
5 years ago |
mosazaid
|
ceb0cde34c
|
finish UCAF design and solve problem on vital signs response
|
5 years ago |
Elham Rababah
|
3dffd33728
|
hot fix
|
5 years ago |
Sultan Khan
|
68cfbf8fc7
|
doctor leave
|
5 years ago |
Elham Rababah
|
1cda486268
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into soap_update
Conflicts:
lib/widgets/patients/profile/soap_update/subjective/update_allergies_widget.dart
|
5 years ago |
Elham Rababah
|
9194d8a44b
|
delete Allergy
|
5 years ago |
mosazaid
|
3b471aebdc
|
Merge branch 'development' into feature-ucaf
|
5 years ago |
mosazaid
|
88ee50f7cb
|
change make referral page loading behaviour
|
5 years ago |
Elham
|
b291572767
|
Merge branch 'soap_update' into 'development'
Fix profile widget
See merge request Cloud_Solution/doctor_app_flutter!223
|
5 years ago |
Elham Rababah
|
8284f1d475
|
Fix profile widget
|
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 |
Mohammad Aljammal
|
812fe10db8
|
Merge branch 'soap_update' into 'development'
Soap update
See merge request Cloud_Solution/doctor_app_flutter!219
|
5 years ago |
Elham Rababah
|
e054c28234
|
hide text
|
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 |
Elham Rababah
|
7d550ca15f
|
prevent null
|
5 years ago |
Elham Rababah
|
cece85cda7
|
small fix remove todo
|
5 years ago |
Elham Rababah
|
2f80af6b74
|
small fix
|
5 years ago |
Elham Rababah
|
71b50c8404
|
First step translations
|
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 |
Mohammad Aljammal
|
d975fb021c
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into soap_update
Conflicts:
lib/routes.dart
lib/util/helpers.dart
|
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 |
Elham Rababah
|
423bd49aee
|
Merge branches 'development' and 'soap_update' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into soap_update
Conflicts:
lib/routes.dart
|
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 |
Elham Rababah
|
856777c648
|
finish updating functions
|
5 years ago |
mosazaid
|
0e645c2b1f
|
Merge branch 'development' into feature_admission_request
|
5 years ago |
mosazaid
|
b60bac6d6e
|
working on UCAF design
|
5 years ago |
Elham Rababah
|
f8b195e368
|
parseHtmlString now working :)
|
5 years ago |
Elham Rababah
|
3cadd532d8
|
finish Updating
|
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 |
Elham Rababah
|
6a7f0e605f
|
Merge branch 'SOAP' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into SOAP
|
5 years ago |
Elham Rababah
|
4caf40a2ab
|
finish plan page
|
5 years ago |
Mohammad Aljammal
|
1af5f1040f
|
add search in soap update
|
5 years ago |
Mohammad Aljammal
|
d5bde6228a
|
add search in update assessment page
|
5 years ago |
hussam al-habibeh
|
b3567df020
|
medical file model
|
5 years ago |
Elham Rababah
|
d8ac550357
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into SOAP
|
5 years ago |
Elham Rababah
|
311bee5136
|
try to fix get
|
5 years ago |
Elham Rababah
|
46043efb42
|
Finish Update objective code Page
|
5 years ago |
Elham Rababah
|
c92a848851
|
Finish Update Subjective Page
|
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
|
9bf08e81da
|
Add search button name and hint search text in MasterKeyCheckboxSearchWidget
|
5 years ago |
Elham Rababah
|
39970fe1a8
|
get update_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 |
Mohammad Aljammal
|
93bece09d7
|
add search in SOAP
|
5 years ago |
Elham Rababah
|
f0fd5d30e1
|
First step from update process
|
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 |
Elham Rababah
|
ea4bf159c6
|
commit issue
|
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
|
49f7dab008
|
Merge branches 'SOAP' and 'patient_arrival_ist' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into SOAP
|
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 |
Elham Rababah
|
df4eb94042
|
work with patient model
|
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 |
Elham Rababah
|
fc82665f1b
|
add ICD10
|
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 |
Elham Rababah
|
2f273dcde8
|
add ICD10
|
5 years ago |
Elham Rababah
|
4e8de52efe
|
add commented code
|
5 years ago |
mosazaid
|
78e2c662c8
|
finish vital sign feature, and adding makeReferralResponse
|
5 years ago |
Elham Rababah
|
14955201a9
|
fix things
|
5 years ago |
Elham Rababah
|
efee00c79e
|
finish add assessment
|
5 years ago |
Elham Rababah
|
72886ccaa7
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into SOAP
Conflicts:
lib/client/base_app_client.dart
|
5 years ago |
Elham Rababah
|
a47e9b69f5
|
add CDI service
|
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 |
Elham Rababah
|
8a6ea1c0c5
|
Fix SOAP
|
5 years ago |
hussam al-habibeh
|
0c18d96ba2
|
post procedure
|
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
|
b2aade9b2b
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates
Conflicts:
lib/client/base_app_client.dart
lib/config/config.dart
|
5 years ago |
hussam al-habibeh
|
c7bfe24207
|
post procedure
|
5 years ago |
Mohammad Aljammal
|
df83883139
|
fix base app client
|
5 years ago |
Mohammad Aljammal
|
7c4e0d929f
|
fix base app client
|
5 years ago |
Elham Rababah
|
ab9740ccdd
|
remove Vida Auth from config
|
5 years ago |
Elham Rababah
|
edef444534
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into SOAP
Conflicts:
lib/config/config.dart
lib/core/service/base/lookup-service.dart
|
5 years ago |
Elham Rababah
|
1672d9a3a0
|
add assessment_page code
|
5 years ago |
Elham Rababah
|
dc4250a4de
|
Post progress Note
|
5 years ago |
Elham Rababah
|
b22fd3f7ba
|
fix listHisProgNotePhysicalExaminationVM
|
5 years ago |
Elham Rababah
|
f97d11183d
|
progress Note
|
5 years ago |
mosazaid
|
a71da8e4ef
|
working on vital signs
|
5 years ago |
hussam al-habibeh
|
47a350a811
|
prscription and procedure
|
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 |
Elham Rababah
|
1491a04b39
|
PostPhysicalExam works
|
5 years ago |
hussam al-habibeh
|
697f17f2cd
|
prescription and procedure
|
5 years ago |
Sultan Khan
|
e45220829f
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Elham Rababah
|
e6af5a3e39
|
remove is Auth for test target
|
5 years ago |
Elham Rababah
|
cd46b4317c
|
fix error null thing
|
5 years ago |
Elham Rababah
|
a362901da8
|
improve code inside my eam
|
5 years ago |
Elham Rababah
|
4df3b1fb40
|
First step from examination
|
5 years ago |
Elham Rababah
|
cde56a82f2
|
Finish subjective
|
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 |