Commit Graph

52 Commits (4e2979cd64fc630fecf1f474d5180d5c832edf12)

Author SHA1 Message Date
Mohammad Aljammal 7167d58ce2 fix merge issues 5 years ago
Mohammad Aljammal aa89a05f1d Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter
 Conflicts:
	ios/Flutter/.last_build_id
	lib/config/config.dart
	lib/config/localized_values.dart
	lib/config/shared_pref_kay.dart
	lib/core/service/client/base_app_client.dart
	lib/core/service/medical/prescriptions_service.dart
	lib/core/viewModels/project_view_model.dart
	lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
	lib/pages/BookAppointment/BookConfirm.dart
	lib/pages/BookAppointment/DoctorProfile.dart
	lib/pages/DrawerPages/family/my-family.dart
	lib/pages/MyAppointments/MyAppointments.dart
	lib/pages/MyAppointments/models/ArrivedButtons.dart
	lib/pages/MyAppointments/widgets/AppointmentActions.dart
	lib/pages/MyAppointments/widgets/AppointmentCardView.dart
	lib/pages/ToDoList/ToDo.dart
	lib/pages/feedback/send_feedback_page.dart
	lib/pages/insurance/insurance_approval_screen.dart
	lib/pages/insurance/insurance_card_screen.dart
	lib/pages/landing/home_page.dart
	lib/pages/landing/landing_page.dart
	lib/pages/login/confirm-login.dart
	lib/pages/login/login.dart
	lib/pages/medical/balance/my_balance_page.dart
	lib/pages/medical/labs/laboratory_result_page.dart
	lib/pages/medical/labs/labs_home_page.dart
	lib/pages/medical/medical_profile_page.dart
	lib/pages/medical/patient_sick_leave_page.dart
	lib/pages/medical/prescriptions/prescription_details_page.dart
	lib/pages/medical/prescriptions/prescription_items_page.dart
	lib/pages/medical/radiology/radiology_details_page.dart
	lib/pages/medical/radiology/radiology_home_page.dart
	lib/pages/medical/reports/report_home_page.dart
	lib/pages/medical/reports/reports_page.dart
	lib/pages/pharmacies/pharmacies_list_screen.dart
	lib/pages/settings/profile_setting.dart
	lib/services/authentication/auth_provider.dart
	lib/uitl/translations_delegate_base.dart
	lib/widgets/buttons/floatingActionButton.dart
	lib/widgets/data_display/medical/LabResult/LabResultWidget.dart
	lib/widgets/data_display/medical/LabResult/laboratory_result_widget.dart
	lib/widgets/data_display/medical/doctor_card.dart
	lib/widgets/drawer/app_drawer_widget.dart
	lib/widgets/others/app_scaffold_widget.dart
5 years ago
Mohammad Aljammal 02d72fa27c fix issues 5 years ago
Mohammad Aljammal de1e352e98 fix charts and vital sign 5 years ago
Mohammad Aljammal 4e823c2be4 fix chart and duplicated data in Patient Lab Result 5 years ago
Mohammad Aljammal b25bdbb6fa fix LiveChatPage Service LabOrderResult MedicineSearch issues 5 years ago
Mohammad Aljammal 2f77592bac fix Prescriptions Service and design issues 5 years ago
Mohammad Aljammal 4d203c8a5b fix LabResult 5 years ago
Zohaib Kambrani 27182ee8db no message 5 years ago
haroon amjad d284ceac04 advance payment & payment flow issues fixed 5 years ago
Mohammad Aljammal 91cada6901 fix Advance Payment 5 years ago
Mohammad Aljammal 67cc5e2033 fix Prescriptions 5 years ago
Mohammad Aljmma a9b11a6b03 fix lab result 5 years ago
Mohammad Aljmma 8f38dc6077 fix issue #24 5 years ago
Mohammad Aljmma a1684bdd9e fix issue #17 & 18 5 years ago
Mohammad Aljmma e1f6ef5e5b fix Prescriptions history 5 years ago
haroon amjad 05ad8f8db5 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 5 years ago
Mohammad Aljmma a077d87dd8 fix user authentication data 5 years ago
haroon amjad 15a8e64e7c updates & fixes 5 years ago
Mohammad Aljmma e42f953bd1 fix prescription report issues 5 years ago
Mohammad Aljammal 53bbafdc2b fix Authenticated User Object 5 years ago
Mohammad Aljammal 06416b4934 add Not authenticated Page 5 years ago
Mohammad Aljammal ac871bb416 Merge branch 'Blood_Donation' into 'master'
Blood donation

See merge request Cloud_Solution/diplomatic-quarter!58
5 years ago
Amjad amireh a00b3a133c Blood Denote 5 years ago
Amjad amireh 5e50c0dc32 Blood Denote 5 years ago
Mohammad Aljammal d6a27a8e28 change medical profile icons 5 years ago
Mohammad Aljammal 3ffff9686d Done allergies service 5 years ago
Mohammad Aljammal 82c2577d36 Done ask doctor service 5 years ago
Mohammad Aljammal 2952fd56ab Done Active Medications Service 5 years ago
Mohammad Aljammal 9f06ce7d1d done EyeMeasurements service 5 years ago
Mohammad Aljammal c01e6095f2 done my trackers 5 years ago
Mohammad Aljammal a0300738e8 done My balance 5 years ago
Mohammad Aljammal 4dd3f9ad01 done Patient Sick Leave 5 years ago
Mohammad Aljammal 11f9daa3ff add PatientSickLeave 5 years ago
Mohammad Aljammal 153335538a done monthly reports 5 years ago
Mohammad Aljammal b0f0b87345 fix merge issues 5 years ago
Mohammad Aljammal fe66ee5993 fix lab result issues 5 years ago
Mohammad Aljammal ef4a57223c fix DoctorView.dart UI issues 5 years ago
haroon amjad 760db6a873 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
#	lib/locator.dart
5 years ago
Mohammad Aljammal f5b16734c6 add time line 5 years ago
Mohammad Aljammal f6d30178bf done medical report 5 years ago
Mohammad Aljammal b6319c558c Merge branch 'report_service' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into vital_sign
 Conflicts:
	lib/locator.dart
	lib/pages/medical/medical_profile_page.dart
5 years ago
haroon amjad 59c279998c working on vital signs integration 6 years ago
Mohammad Aljammal 2b0e35a907 fix issues in base app client 6 years ago
Amjad Amireh 97dbe62f93 done report service 6 years ago
Mohammad Aljammal a1fa2c0727 done vital sign 6 years ago
Mohammad Aljammal cfd5b2ccff feedback Service done 6 years ago
Mohammad Aljammal a12197fe70 labs result done add some file to git ignore for ios 6 years ago
Mohammad Aljammal 1bbbd18373 labs services 6 years ago
Mohammad Aljammal 940b327561 done Prescriptions 6 years ago