425 Commits (e5de65bc825a433e477590d904359fd5db51668b)

Author SHA1 Message Date
hussam al-habibeh 03f39b8bab insurance approval new design 5 years ago
mosazaid c642d88804 some fixes 5 years ago
mosazaid cc7c5af1d0 referral details fix bugs 5 years ago
Mohammad Aljammal e038ec4333 Merge branch 'patient_app_services' into 'development'
Create procedure card

See merge request Cloud_Solution/doctor_app_flutter!400
5 years ago
Mohammad Aljammal 328bb25496 Create procedure card 5 years ago
hussam al-habibeh d1a6c2a703 adding add prescription form 5 years ago
Mohammad Aljammal 7facc70a4c Merge branch 'patient_app_services' into 'development'
Change the font type in the app and Prescription

See merge request Cloud_Solution/doctor_app_flutter!395
5 years ago
Mohammad Aljammal d45b8a9cc5 change the font type in the app and Prescription 5 years ago
Sultan Khan c3f19d5ccf Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan 5256c9633f leave reschedule change 5 years ago
hussam al-habibeh 2a1426ecd9 adding lab form and radiology 5 years ago
Mohammad Aljammal ba13ea7140 Merge branch 'patient_app_services' into 'development'
Patient app services

See merge request Cloud_Solution/doctor_app_flutter!389
5 years ago
Mohammad Aljammal 920ec14bc2 add new design for Lab Result and Radiology Results 5 years ago
mosazaid 6eaf448d5a working on new design for vital sign and admission request 5 years ago
Mohammad Aljammal 6267d805f0 hot fixes 5 years ago
Sultan Khan a491eee7f7 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan e640bcf975 search updated 5 years ago
Mohammad Aljammal de48ae2bff Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services
 Conflicts:
	lib/config/config.dart
5 years ago
Mohammad Aljammal 17f8b05748 Add prescriptions and radiology from the patient app 5 years ago
Sultan Khan 091234ad77 bug fix 5 years ago
Sultan Khan 10ef8f7954 bug fixes 5 years ago
Sultan Khan 1ac94d9ec8 bug fixes 5 years ago
Sultan Khan 12dc637163 bug fixes 5 years ago
Mohammad Aljammal 7dae41513f Add insurance approval services 5 years ago
Mohammad Aljammal e515265f11 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services
 Conflicts:
	lib/config/localized_values.dart
	lib/util/translations_delegate_base.dart
5 years ago
Mohammad Aljammal 0742d64428 add lab result services 5 years ago
Elham Rababah 103a1bc6fc Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into clinic_list
 Conflicts:
	lib/config/localized_values.dart
	lib/screens/medicine/medicine_search_screen.dart
	lib/util/translations_delegate_base.dart
5 years ago
hussam al-habibeh 06fdee2d2d hussam 5 years ago
Elham Rababah 234cc57a2a return search medicine 5 years ago
Mohammad Aljammal 1af6115365 add ECG and Show sick leave 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
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 340bfd0a1c add clinic to arrival search patient 5 years ago
mosazaid fdc893c3d6 make search patient profile have preview services 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 c239dbc620 Claculate Box Quantity while adding prescrption 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 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 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
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 3250f33b43 jira bugs fix 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 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
hussam al-habibeh f32d25b007 updating prescription after backend fix 5 years ago
Mohammad Aljammal 3c090ecdaf Merge branch 'fix-issues' into 'development'
design inhancment

See merge request Cloud_Solution/doctor_app_flutter!319
6 years ago
hussam al-habibeh 0f15732728 design inhancment 6 years ago
hussam al-habibeh 57aea2ba4f pharmacy remarks 6 years ago
hussam al-habibeh 963fe42cd8 new changes 6 years ago
Mohammad Aljammal 98bc5f7812 Merge branch 'fix-issues' into 'development'
DA-355

See merge request Cloud_Solution/doctor_app_flutter!316
6 years ago
Sultan Khan 958a341c3b sick leave 6 years ago
hussam al-habibeh d115564cc1 DA-355 6 years ago
hussam al-habibeh 2563b10216 DA-367 6 years ago
mosazaid a047255f2c add referral get facilties 6 years ago
hussam al-habibeh 28370e7492 fix bugs 6 years ago
mosazaid 4f302694b3 Merge branch 'development' into fix-bugs10_2 6 years ago
mosazaid 498c6c00af fix minor issue bugs (DA-273, DA-361, DA-362, DA-363) 6 years ago
Mohammad Aljammal d41fd496b6 Merge branch 'fix-issues' into 'development'
fixing bugs

See merge request Cloud_Solution/doctor_app_flutter!300
6 years ago
hussam al-habibeh 5bde14813a fixing bugs 6 years ago
mosazaid 1207339b01 Merge branch 'development' into admission-request 6 years ago
mosazaid 8d154239bb finish admission request feature 6 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
6 years ago
mosazaid a618292d20 bug fixes for DA-284-DA-285 6 years ago
Mohammad Aljammal 2e19af335e Merge branch 'feature-ucaf' into 'development'
Feature ucaf

See merge request Cloud_Solution/doctor_app_flutter!296
6 years ago
Mohammad Aljammal 0c6ba54680 Merge branch 'fix-issues' into 'development'
jira bugs fix

See merge request Cloud_Solution/doctor_app_flutter!294
6 years ago
mosazaid f87f851100 Merge branch 'development' into feature-ucaf
# Conflicts:
#	lib/core/service/base/lookup-service.dart
#	lib/util/translations_delegate_base.dart
6 years ago
mosazaid 2b3a7f33d1 working on some bug fixes and finish addmission request 6 years ago
hussam al-habibeh 539f7facc7 jira bugs fix 6 years ago
Mohammad Aljammal 127b5eb4bd Merge branch 'fix-issues' into 'development'
fix bugs

See merge request Cloud_Solution/doctor_app_flutter!292
6 years ago
hussam al-habibeh 6dd1d9ef90 fix bugs 6 years ago
Sultan Khan 8b7acf7202 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 6 years ago
Sultan Khan 6a23c2a137 bug fix 6 years ago
hussam al-habibeh d78aa2321d bug fix 6 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
6 years ago
hussam al-habibeh 15dd0f7c1a bug fix 6 years ago
mosazaid 5b5954c6f3 working on Admission request feature adding lookup 6 years ago
mosazaid b63c7aff25 Fix DA-331 vital signs uncorrect temperature value 6 years ago
hussam al-habibeh 29de472c66 bug fix 6 years ago
mosazaid c2df291029 DA - 286 Fix 6 years ago
mosazaid cca4e33fce Merge branch 'development' into feature-ucaf
# Conflicts:
#	lib/config/localized_values.dart
#	lib/util/translations_delegate_base.dart
6 years ago
mosazaid ebc5ba7743 some fixes 6 years ago
mosazaid e75318799f Merge branch 'development' into feature-ucaf 6 years ago
mosazaid ac9fd8c936 samll fixes for labels and msges 6 years ago
Mohammad Aljammal 81fdcb2d8d Merge branch 'fix_issues' into 'development'
Fix issues

See merge request Cloud_Solution/doctor_app_flutter!271
6 years ago
Mohammad Aljammal fbd509d6ec Merge branch 'fix-issues' into 'development'
bugs fix

See merge request Cloud_Solution/doctor_app_flutter!272
6 years ago
hussam al-habibeh fb8381ea61 bugs fix 6 years ago
Elham Rababah a5bccddf55 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_issues 6 years ago
Elham Rababah 9ddfbd3e66 fix issue on app drawer 6 years ago
Sultan Khan d5d7ea6c49 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 6 years ago
Sultan Khan 63e8ee8dd0 sick leave 6 years ago
hussam alhababieh 3c55af7adc Merge branch 'development' into 'tasks-translation'
# Conflicts:
#   lib/screens/prescription/add_prescription_form.dart
6 years ago
hussam al-habibeh 7c800bdab4 medical file fix 6 years ago
Elham Rababah 00543a759a fix remarks in allergies 6 years ago
Elham Rababah 8c9ffc2e62 fix multiple issue 6 years ago
Mohammad Aljammal 35a9f34b18 Merge branch 'development' into 'sultan'
# Conflicts:
#   lib/widgets/patients/profile/profile_medical_info_widget.dart
6 years ago
Sultan Khan 135c852e8c Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 6 years ago
Sultan Khan 735698ce90 bug fixes 6 years ago
hussam al-habibeh bada160cf5 Search Medacation 6 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
6 years ago
hussam al-habibeh 4a4cd03f63 Prescription date 6 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
6 years ago
Elham Rababah ba263ada44 fix DA-201 6 years ago
Elham Rababah 4e4e6a3600 fix DA-151 6 years ago
Sultan Khan d55ce4c1ec Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 6 years ago
Mohammad Aljammal 574e1525d9 Merge branch 'tasks-translation' into 'development'
Prescription & medical file fix

See merge request Cloud_Solution/doctor_app_flutter!262
6 years ago
Sultan Khan 896078507f gub fixes 6 years ago
hussam al-habibeh e133a014e8 Prescription & medical file fix 6 years ago
mosazaid e808d48035 Merge branch 'development' into feature-ucaf
# Conflicts:
#	lib/config/localized_values.dart
#	lib/util/translations_delegate_base.dart
6 years ago
mosazaid 88f1dc637f some fixes 6 years ago
Elham Rababah e9de8a72e9 fix DA-152 6 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
6 years ago
Elham Rababah 9674eb89d9 add modification on so 6 years ago
Sultan Khan 417ca9401b Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 6 years ago
Sultan Khan a99b3847ac login completed 6 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
6 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
6 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
6 years ago
Elham Rababah 6bab2e0b2d fix referral patient issue 6 years ago
mosazaid 8424e92c4b working on vital Sign feature with Charts 6 years ago
Sultan Khan 722e1a5c41 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 6 years ago
Sultan Khan ad99cebf02 login and drug to drug 6 years ago
Mohammad Aljammal 307463865b Merge branch 'feature-ucaf' into 'development'
Feature ucaf

See merge request Cloud_Solution/doctor_app_flutter!249
6 years ago
Mohammad Aljammal 3306d6f400 Merge branch 'medical-file' into 'development'
post Procedure

See merge request Cloud_Solution/doctor_app_flutter!248
6 years ago
hussam al-habibeh dd53a9bd4d post Procedure 6 years ago
mosazaid 8726653ffb working on Referral feature 6 years ago
Sultan Khan 909940a6d9 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 6 years ago
Sultan Khan 40e9ab864a login changes 6 years ago
Mohammad Aljammal 21114fc88f Merge branch 'development' into 'feature-ucaf'
# Conflicts:
#   lib/config/localized_values.dart
#   lib/util/translations_delegate_base.dart
6 years ago
Mohammad Aljammal 70cfc4668b Merge branch 'medical-file' into 'development'
Medical file

See merge request Cloud_Solution/doctor_app_flutter!243
6 years ago
Elham 9e7a7210c4 Merge branch 'soap_update' into 'development'
Soap update

See merge request Cloud_Solution/doctor_app_flutter!244
6 years ago
Elham Rababah 0147e7e49b do translation, fix some bugs 6 years ago
Elham Rababah 175ba545e7 finish create episode 6 years ago
Elham Rababah 4f1a892be4 first step form create episode 6 years ago
mosazaid fd2a86dca4 some changes in patientArrivalList And make action when click on vitalSign widget inside pendingReferral 6 years ago
hussam al-habibeh f767467a67 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into medical-file 6 years ago
hussam al-habibeh bcbd091dae ss 6 years ago
mosazaid ff906338bf Merge branch 'development' into feature-ucaf 6 years ago
mosazaid 9a5cafaaf5 working on UCAF detail screen , and some cahgnes on referral list 6 years ago
mosazaid e14df2855a Merge branch 'development' into feature-ucaf 6 years ago
mosazaid 50d7f733b6 working on UCAF datails and add patient procedure list and diagnosis 6 years ago
Sultan Khan c4cae6fb38 doctor leave bug fix 6 years ago
Sultan Khan 87d90a394b Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 6 years ago
Sultan Khan 044ad7b51a offtime leave 6 years ago
mosazaid b67fd55aac Merge branch 'development' into feature-ucaf 6 years ago
mosazaid e75e7801aa working on UCAF get data 6 years ago
Mohammad Aljammal d7b8e29455 Merge branch 'medical-file' into 'development'
drug list

See merge request Cloud_Solution/doctor_app_flutter!234
6 years ago
hussam al-habibeh f997561bb8 drug list 6 years ago
mosazaid a51239447b Merge branch 'development' into feature-ucaf 6 years ago
hussam al-habibeh 76cc4d11f8 medical file 6 years ago
mosazaid ceb0cde34c finish UCAF design and solve problem on vital signs response 6 years ago
mosazaid 88ee50f7cb change make referral page loading behaviour 6 years ago
hussam al-habibeh eef5d57d2f Merge branches 'development' and 'pesrcription-post' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into pesrcription-post 6 years ago
hussam al-habibeh 16b949461d prescription post 6 years ago
mosazaid ce164c3cb6 Merge branch 'development' into feature-ucaf
# Conflicts:
#	lib/config/localized_values.dart
#	lib/util/translations_delegate_base.dart
6 years ago
mosazaid 0c39dc6693 change on vital signs for uncoment the service 6 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
6 years ago
Sultan Khan 9adc5ddd8e Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 6 years ago
Elham Rababah 71b50c8404 First step translations 6 years ago
Sultan Khan 6c894c3d3b sick leave 6 years ago
Sultan Khan 43a1e56a8b Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 6 years ago
Sultan Khan 9bf07d7117 reschedule leave 6 years ago
hussam al-habibeh e72ef46efb Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates 6 years ago
hussam al-habibeh 4ffeb31181 update procedure fixes 6 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
6 years ago
Sultan Khan 4587fdda59 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 6 years ago
Sultan Khan e23bb7ce94 reschedule leave 6 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
6 years ago
mosazaid b4f813fc2d Merge branch 'development' into feature_admission_request
# Conflicts:
#	lib/locator.dart
#	lib/routes.dart
6 years ago
Mohammad Aljammal 3cb96f35ca Merge branch 'design-updates' into 'development'
Design updates

See merge request Cloud_Solution/doctor_app_flutter!211
6 years ago
hussam al-habibeh 75eda8832d Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates 6 years ago
hussam al-habibeh d1a261c847 procedure update 6 years ago
mosazaid 0e645c2b1f Merge branch 'development' into feature_admission_request 6 years ago
Elham Rababah 3cadd532d8 finish Updating 6 years ago
Sultan Khan b2aef274bb Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 6 years ago
Sultan Khan 3c968f0de1 doctor leave 6 years ago
Elham Rababah 4caf40a2ab finish plan page 6 years ago
hussam al-habibeh b3567df020 medical file model 6 years ago
Elham Rababah d8ac550357 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into SOAP 6 years ago
Elham Rababah 311bee5136 try to fix get 6 years ago
Elham Rababah 46043efb42 Finish Update objective code Page 6 years ago
Elham Rababah c92a848851 Finish Update Subjective Page 6 years ago
mosazaid 095a915a89 Merge branch 'development' into feature_admission_request
# Conflicts:
#	lib/routes.dart
6 years ago
mosazaid cb4ee05b40 working on ucaf 6 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
6 years ago
hussam al-habibeh adb8033138 update prescription 6 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
6 years ago
Elham Rababah 39970fe1a8 get update_subjective_page.dart 6 years ago
Elham Rababah f0fd5d30e1 First step from update process 6 years ago
mosazaid ae6cd0e5f8 Merge branch 'development' into feature_admission_request 6 years ago
mosazaid 5142b5b6c7 finish admission request design 6 years ago
hussam al-habibeh b3345a86ef post prescription 6 years ago
Elham Rababah ea4bf159c6 commit issue 6 years ago
Sultan Khan 669655307a Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 6 years ago