Commit Graph

207 Commits (d66bc3ea2a3c8d9c2e2f022dcf25e202c152a3c2)

Author SHA1 Message Date
Mohammad Aljammal b3ae86db31 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into ZohaibKambrani
 Conflicts:
	lib/screens/patients/DischargedPatientPage.dart
	lib/screens/patients/ReferralDischargedPatientDetails.dart
	lib/screens/patients/insurance_approvals_details.dart
	lib/screens/patients/patients_screen.dart
	lib/screens/patients/profile/note/progress_note_screen.dart
	lib/screens/patients/profile/referral/referral_patient_detail_in-paint.dart
	lib/screens/prescription/update_prescription_form.dart
	lib/screens/sick-leave/add-sickleave.dart
	lib/widgets/patients/PatientCard.dart
	pubspec.lock
5 years ago
hussam al-habibeh 292bc2a97f prescription changes 5 years ago
hussam al-habibeh c50a483663 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into prescription_changes
 Conflicts:
	lib/core/service/patient_medical_file/prescription/prescription_service.dart
	lib/core/viewModel/prescription_view_model.dart
	lib/screens/prescription/add_prescription_form.dart
5 years ago
hussam al-habibeh cecc1a725d pescription changes 5 years ago
hussam al-habibeh bc340693ba project refactoring 5 years ago
hussam al-habibeh 9457e04825 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into app_translation
 Conflicts:
	lib/core/viewModel/PatientSearchViewModel.dart
	lib/screens/patients/PatientsInPatientScreen.dart
	lib/screens/patients/out_patient/out_patient_screen.dart
	lib/screens/patients/patient_search/patient_search_result_screen.dart
	lib/screens/patients/profile/referral/AddReplayOnReferralPatient.dart
	lib/screens/sick-leave/add-sickleave.dart
5 years ago
hussam al-habibeh 6107f88c16 prescription changes 5 years ago
hussam al-habibeh d2814f610e hot fix 5 years ago
hussam al-habibeh 68e9470273 hot fix 5 years ago
hussam al-habibeh ed8da38bc9 hot fix 5 years ago
hussam al-habibeh ca11da36b3 hot fix 5 years ago
hussam al-habibeh c17d3d63e0 hot fix 5 years ago
Mohammad Aljammal 06706ad9a6 Fix prescription item 5 years ago
hussam al-habibeh e16d91a1b8 add prescription form changes 5 years ago
Mohammad Aljammal eb0fda3555 hot fix 5 years ago
hussam al-habibeh a82a3fa38d add prescription changes 5 years ago
hussam al-habibeh f07208586d Add Prescription changes 5 years ago
hussam al-habibeh c4a6d9ad6f prescription changes 5 years ago
hussam al-habibeh 4eba6d9f5a Project refactoring 5 years ago
hussam al-habibeh c24bb604d4 DashBoard design fix 5 years ago
hussam al-habibeh c86a3dabda page translation 5 years ago
Mohammad Aljammal dc9f75f0ca hot fixes 5 years ago
Mohammad Aljammal 60eb7adab1 hot fixes 5 years ago
Zohaib Iqbal Kambrani 4b7688d620 showDailog Migration
DateUtils Conflict with Material (DateUtils -> AppDateUtils)
5 years ago
Mohammad Aljammal 357e01c846 hot fixes 5 years ago
Mohammad Aljammal 29e2d962bc Optimize imports 5 years ago
hussam al-habibeh 1d09bcf251 hot fixes 5 years ago
hussam al-habibeh 017074ba56 Prescriptions for in patient 5 years ago
Elham Rababah bd01624f5a create New order widget 5 years ago
mosazaid 72bb64b460 finish working on app text widget 5 years ago
mosazaid bbe94d2b9b Merge branch 'development' into design-fixes
# Conflicts:
#	lib/screens/patients/profile/UCAF/UCAF-input-screen.dart
#	lib/screens/patients/profile/admission-request/admission-request-first-screen.dart
#	lib/screens/patients/profile/admission-request/admission-request-third-screen.dart
#	lib/screens/patients/profile/admission-request/admission-request_second-screen.dart
#	lib/screens/patients/profile/refer_patient_screen.dart
#	lib/screens/patients/profile/referral/refer-patient-screen.dart
#	lib/screens/patients/profile/soap_update/assessment/add_assessment_details.dart
#	lib/screens/patients/profile/soap_update/plan/update_plan_page.dart
#	lib/screens/patients/profile/soap_update/subjective/medication/add_medication.dart
#	lib/screens/prescription/add_prescription_form.dart
#	lib/screens/prescription/prescription_warnings.dart
#	lib/widgets/auth/login_form.dart
#	lib/widgets/shared/master_key_checkbox_search_allergies_widget.dart
5 years ago
Elham Rababah b59bd0bd43 small fix in prescription_items_page 5 years ago
Elham Rababah 7b7ce4e037 refactor utils folder 5 years ago
mosazaid b8f6c35e75 working on buttons widgets 5 years ago
Elham Rababah e73ca8af71 first step from change text fields 5 years ago
Sultan Khan 5aa4569c6b bug fix 5 years ago
Mohammad Aljammal b0bd37d991 Merge branch 'fix-issues' into 'development'
removing lookup list call in page opening

See merge request Cloud_Solution/doctor_app_flutter!489
5 years ago
hussam al-habibeh ff2f456b46 removing lookup list call in page opening 5 years ago
Mohammad Aljammal 9fbb5f026b Merge branch 'sultan' into 'development'
Sultan

See merge request Cloud_Solution/doctor_app_flutter!487
5 years ago
Sultan Khan 9268b13312 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan 5c4aee849e bug fixes 5 years ago
hussam al-habibeh caec2f5a88 removing medication list from model ready 5 years ago
hussam al-habibeh b697d924c5 removing medication list from model ready 5 years ago
hussam al-habibeh 9645791164 changeing add prescription behovior 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
hussam al-habibeh c72d612646 add prescription & add lab test changes 5 years ago
Mohammad Aljammal c87f235cd2 fix the design issues 5 years ago
hussam al-habibeh f89eb0f76b Procedure screen changes 5 years ago
hussam al-habibeh 1fba6c839c insurance approvals deatils fix 5 years ago
Mohammad Aljammal ecccb2d068 fix font size 5 years ago
Mohammad Aljammal 3a8225e666 hot fix 5 years ago
Mohammad Aljammal e978bd0df3 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services 5 years ago
Mohammad Aljammal 16f285fa63 add the image dialog 5 years ago
hussam al-habibeh b1ec91b20a Design Fixes 5 years ago
hussam al-habibeh 29029a7dea Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix-issues 5 years ago
hussam al-habibeh 709c11d103 Design Fixes 5 years ago
Mohammad Aljammal 6cd04996ec hot fix 5 years ago
Mohammad Aljammal 3fafa0ab01 add the patient cad as toolbar 5 years ago
hussam al-habibeh d1a6c2a703 adding add prescription form 5 years ago
Mohammad Aljammal d45b8a9cc5 change the font type in the app and Prescription 5 years ago
Mohammad Aljammal 920ec14bc2 add new design for Lab Result and Radiology Results 5 years ago
Mohammad Aljammal 6fbd2076d4 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services 5 years ago
hussam al-habibeh e4bfdd198b Add Prescription Form New Design 5 years ago
Mohammad Aljammal 747a0b7da4 change the lab result design 5 years ago
Mohammad Aljammal a167db7651 Fix prescription items 5 years ago
Mohammad Aljammal 17f8b05748 Add prescriptions and radiology from the patient app 5 years ago
hussam al-habibeh 06fdee2d2d hussam 5 years ago
hussam al-habibeh 15774e5b05 hussam 5 years ago
hussam al-habibeh 983f03108f adding prescription history & Medical file for all patient types 5 years ago
hussam al-habibeh bcf25d7b95 Medical Report & update Prescription form update 5 years ago
hussam al-habibeh 53d22a8d6d hussam 5 years ago
hussam al-habibeh d099ac9b57 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 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
hussam al-habibeh 24d13b06c5 Procedure update valdation 5 years ago
hussam al-habibeh 4e01bcb758 Prescription update filters 5 years ago
hussam al-habibeh 8aeb749596 prescription update 5 years ago
hussam al-habibeh 7063e924de update prescription 5 years ago
hussam al-habibeh bfe73ebe1d DA-185 5 years ago
hussam al-habibeh dc941b709f DA-396 5 years ago
hussam al-habibeh 066ac94d4a jira bugs 5 years ago
hussam al-habibeh 3250f33b43 jira bugs fix 5 years ago
hussam al-habibeh f32d25b007 updating prescription after backend fix 5 years ago
hussam al-habibeh ae17998e0a Design inhancment 5 years ago
hussam al-habibeh 54ad8bde0b design inhancment 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
hussam al-habibeh d115564cc1 DA-355 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 d8d2e7f1d6 fix ios issues 5 years ago
hussam al-habibeh d20e83faa5 bug fixing 5 years ago