399 Commits (bf0ec6a03580bdf9de0ae8db46fb2f0cc2da94f8)

Author SHA1 Message Date
hussam al-habibeh 017074ba56 Prescriptions for in patient 5 years ago
Elham Rababah f2011301c6 update progress_note 5 years ago
mosazaid 9aecc6fbdb add lap results to inpatient and some changes on patient profile 5 years ago
mosazaid b6a6f16b31 add vital sign inPatient 5 years ago
Elham Rababah 7b7ce4e037 refactor utils folder 5 years ago
Sultan Khan f6e0e1b0cd Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan fda75c721d bug fixes 5 years ago
Haroon Amjad 6fc72328b7 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development 5 years ago
Haroon Amjad 27b4450dac versionID changed to 5.5 5 years ago
Elham Rababah 76d411b79a move soap folder to the correct place 5 years ago
Mohammad Aljammal d450affa37 Merge branch 'Stepper_header' into 'development'
add doctor replay

See merge request Cloud_Solution/doctor_app_flutter!502
5 years ago
Elham Rababah 4ecf9fe4b9 add doctor replay 5 years ago
mosazaid 4b32487540 referral design and service changes 5 years ago
mosazaid 82cbf392af Merge branch 'development' into textfield-validation 5 years ago
mosazaid a701b6e989 make referral changes 5 years ago
Sultan Khan 91a499090b Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan 649379d88f bug fix 5 years ago
Mohammad Aljammal b6941d9f63 Merge branch 'Stepper_header' into 'development'
small fixes in soap and in all app.

See merge request Cloud_Solution/doctor_app_flutter!495
5 years ago
Elham Rababah 2aba9e79f1 small fixes in soap and in all app. 5 years ago
Sultan Khan 9268b13312 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Mohammad Aljammal 8ed9b3c023 Merge branch 'Stepper_header' into 'development'
Stepper header

See merge request Cloud_Solution/doctor_app_flutter!484
5 years ago
Sultan Khan 148ea967fb Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Elham Rababah 14cf5a5a1c finish fix the assessment 5 years ago
hussam al-habibeh 9645791164 changeing add prescription behovior 5 years ago
Sultan Khan 0498545e5c no data 5 years ago
Mohammad Aljammal b812ac4b06 add no data image in all pages 5 years ago
Mohammad Aljammal 8055fa17eb add the branch in all doctors card and add no data image 5 years ago
mosazaid f0f4613960 Merge branch 'development' into soap-objective-feature-re-design 5 years ago
mosazaid f8f088fe8c design changes 5 years ago
hussam al-habibeh 136c839c93 hot fixes 5 years ago
Mohammad Aljammal ecccb2d068 fix font size 5 years ago
Elham Rababah fc98e75ec3 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into doctor_replay
 Conflicts:
	lib/config/localized_values.dart
5 years ago
Elham Rababah 04f39315b5 finish doctor replay 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 17f8b05748 Add prescriptions and radiology from the patient app 5 years ago
Sultan Khan 10ef8f7954 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 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 340bfd0a1c add clinic to arrival search patient 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 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 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
hussam al-habibeh 0f15732728 design inhancment 5 years ago
hussam al-habibeh 57aea2ba4f pharmacy remarks 5 years ago
hussam al-habibeh 963fe42cd8 new changes 5 years ago
hussam al-habibeh d115564cc1 DA-355 5 years ago
mosazaid a047255f2c add referral get facilties 5 years ago
hussam al-habibeh 28370e7492 fix bugs 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
hussam al-habibeh 5bde14813a fixing bugs 5 years ago
mosazaid 8d154239bb finish admission request feature 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 6dd1d9ef90 fix bugs 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 c2df291029 DA - 286 Fix 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
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
mosazaid 97d05c72c2 Merge branch 'development' into feature-ucaf
# Conflicts:
#	lib/config/localized_values.dart
#	lib/util/translations_delegate_base.dart
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
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
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
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 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 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
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
Sultan Khan 669655307a Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 6 years ago
Sultan Khan 49e9ecfa4a doctor leave 6 years ago
Elham 88c2c04d68 Merge branch 'design-updates' into 'development'
post prescription

See merge request Cloud_Solution/doctor_app_flutter!203
6 years ago
Elham Rababah 61209663f3 Finish arrived 6 years ago
mosazaid 873ee67eb7 Merge branch 'development' into feature_admission_request
# Conflicts:
#	lib/routes.dart
6 years ago
mosazaid 433b2933c4 working with admission request and some changes in vital signs 6 years ago
mosazaid f35eff1220 working with admission request 6 years ago
hussam al-habibeh 17079a1bd9 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates 6 years ago
hussam al-habibeh 9d8514c83b post prescription 6 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
6 years ago
Mohammad Aljammal 04ed76069c hack login 6 years ago
Mohammad Aljammal 21252c6ae9 Merge branch 'feature-vital-sign' into 'development'
Feature vital sign

See merge request Cloud_Solution/doctor_app_flutter!201
6 years ago
mosazaid 78e2c662c8 finish vital sign feature, and adding makeReferralResponse 6 years ago
Elham Rababah efee00c79e finish add assessment 6 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
6 years ago
Elham Rababah a47e9b69f5 add CDI service 6 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
6 years ago
mosazaid b5c937bd86 Working on vitalSigns,
Merge branch 'development' into feature-vital-sign

# Conflicts:
#	lib/routes.dart
6 years ago