Commit Graph

135 Commits (e36e0ce0b7b07d413a72232e09c8ef6630e5d36e)

Author SHA1 Message Date
Mirza.Shafique d37f225c1b Home page 1.2 5 years ago
Mirza.Shafique 2fda47baf6 Medical Profile Buttons Lock 5 years ago
Elham Rababah 9588b134fb PAP-645: resized calculator 5 years ago
Elham Rababah fa23c607bd Merge branches 'development' and 'fix_bugs_Mar' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_bugs_Mar 5 years ago
Elham Rababah 7bdf31000f PAP-356: fix chart design 5 years ago
Zohaib Iqbal Kambrani b91ce441e2 Merge branch 'development' into ZohaibIqbalKambrani
# Conflicts: Resolved
#	lib/core/model/pharmacies/order_model.dart
#	lib/core/service/client/base_app_client.dart
#	lib/main.dart
#	lib/pages/landing/home_page.dart
#	lib/pages/pharmacy/order/OrderDetails.dart
#	lib/pages/pharmacy/order/TrackDriver.dart
#	lib/routes.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/uitl/utils.dart
#	lib/widgets/in_app_browser/InAppBrowser.dart
#	lib/widgets/others/app_scaffold_widget.dart
#	pubspec.yaml
5 years ago
Sultan Khan 9bfd725e4f bug fixes 5 years ago
Sultan Khan b891c1bd80 theme issue 5 years ago
Sultan Khan 1a35fe37b6 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan Khan e61c26b853 Auto SMS, Themes, Voice Command 5 years ago
Mohammad Aljammal 8899bdf460 Done Prescription Delivery Address 5 years ago
Mohammad Aljammal 0098345d05 add Prescription Delivery Address Page amd fix the Authentication Pharmacy 5 years ago
Mohammad Aljammal 3e441c55b2 fix bottom nav bar 5 years ago
Mohammad Aljammal ed729689a9 Merge branch 'design_issues' into 'development'
fix design issues

See merge request Cloud_Solution/diplomatic-quarter!237
5 years ago
Mohammad Aljammal 634c874eee fix design issues 5 years ago
Mohammad Aljammal 72290f041f fix design 5 years ago
Mohammad Aljammal 298b4d6525 change color 5 years ago
Mohammad Aljammal 952e106531 return privilege 5 years ago
Mohammad Aljammal 18dad434a0 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into merge_dq_master
 Conflicts:
	lib/config/config.dart
	lib/core/service/client/base_app_client.dart
	lib/core/service/weather_service.dart
	lib/core/viewModels/dashboard_view_model.dart
	lib/main.dart
	lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
	lib/pages/AlHabibMedicalService/health-weather/health-weather-indicator.dart
	lib/pages/BookAppointment/Search.dart
	lib/pages/ErService/AmbulanceReq.dart
	lib/pages/MyAppointments/widgets/AppointmentCardView.dart
	lib/pages/ToDoList/ToDo.dart
	lib/pages/landing/home_page.dart
	lib/pages/landing/landing_page.dart
	lib/pages/login/login.dart
	lib/pages/login/register.dart
	lib/pages/medical/allergies_page.dart
	lib/pages/medical/balance/advance_payment_page.dart
	lib/pages/medical/doctor/doctor_home_page.dart
	lib/pages/medical/medical_profile_page.dart
	lib/pages/medical/prescriptions/prescriptions_home_page.dart
	lib/pages/medical/vital_sign/vital_sign_details_screen.dart
	lib/uitl/location_util.dart
	lib/widgets/drawer/app_drawer_widget.dart
	pubspec.yaml
5 years ago
Mohammad Aljammal 519a474d41 fix live care label and vital sign data 5 years ago
Mohammad Aljammal 591d56e624 change the info images and change the out patient color 5 years ago
Mohammad Aljammal 9c18c69d90 hot fixes 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 b29fdbb7d0 fix home issues 5 years ago
Mohammad Aljammal 02d72fa27c fix issues 5 years ago
Mohammad Aljammal f38f53587b fix issues 5 years ago
Mohammad Aljammal 19f12116c4 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fix 5 years ago
Mohammad Aljammal de1e352e98 fix charts and vital sign 5 years ago
Haroon Amjad b9269f525a hot fixes 5 years ago
Haroon Amjad 81b51bef51 Merge branch 'diplomatic-quarter-live' into diplomatic-quarter-haroon 5 years ago
Mohammad Aljammal 4e823c2be4 fix chart and duplicated data in Patient Lab Result 5 years ago
haroon amjad 051bd1e23f Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 5 years ago
Mohammad Aljammal b25bdbb6fa fix LiveChatPage Service LabOrderResult MedicineSearch issues 5 years ago
Mohammad Aljammal eca2266f7b hot fixing 5 years ago
Mohammad Aljammal 4d203c8a5b fix LabResult 5 years ago
Zohaib Kambrani 27182ee8db no message 5 years ago
haroon amjad 92db2b2be9 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 5 years ago
haroon amjad e5feef8a9d Updates & UI Fixes 5 years ago
Mohammad Aljammal b504f379de fix lab result translations and colors 5 years ago
Mohammad Aljmma a9b11a6b03 fix lab result 5 years ago
Mohammad Aljmma ed7b9d609f fix lab result 5 years ago
Mohammad Aljmma a1684bdd9e fix issue #17 & 18 5 years ago
Mohammad Aljmma 179df475b4 fix issue #9 5 years ago
Mohammad Aljmma 27594f15b8 fix issue#1 5 years ago
Mohammad Aljmma e42f953bd1 fix prescription report issues 5 years ago
haroon amjad aeab57beab Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
# Conflicts:
#	lib/main.dart
#	lib/pages/landing/home_page.dart
5 years ago
haroon amjad f5a2870fac Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
Implemented Badge count on ToDo list & my appointments
5 years ago
Mohammad Aljmma e10a0a4d54 add splash page fix language issues 5 years ago
Mohammad Aljmma 856ab52439 fix ui issues 5 years ago
Mohammad Aljmma 89cfcd3cad fix design issues 5 years ago
Mohammad Aljmma 0b90d3c687 fix issues 5 years ago
Mohammad Aljmma 874de15040 change the home page design 5 years ago
Mohammad Aljmma 1cf4797d4f add font 5 years ago
Sultan Khan 3ad928902b voice command 5 years ago
Sultan Khan ea86e88e2e Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Elham Rababah bf6a8cecc6 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into h20_E_referral
 Conflicts:
	lib/config/config.dart
	lib/locator.dart
	lib/pages/landing/landing_page.dart
	pubspec.yaml
5 years ago
Mohammad Aljammal 3946f0355c Merge branches 'master' and 'my_trackers' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into my_trackers
 Conflicts:
	lib/config/localized_values.dart
	lib/core/service/client/base_app_client.dart
	lib/locator.dart
	lib/pages/landing/landing_page.dart
5 years ago
Mohammad Aljammal d6a27a8e28 change medical profile icons 5 years ago
Elham Rababah 91a8b94382 Merge branch 'E_referral' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into h20_E_referral
 Conflicts:
	lib/config/config.dart
	lib/locator.dart
	lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
	lib/pages/landing/landing_page.dart
5 years ago
Sultan Khan 03ff56f2de Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan 591e9e9a4c updated 5 years ago
hussam al-habibeh 3c5adc0a1d HMG Service layout 5 years ago
Mohammad Aljammal 9f06ce7d1d done EyeMeasurements service 5 years ago
Elham Rababah f1f3b6bd56 first step from e-referral 5 years ago
Mohammad Aljammal a0300738e8 done My balance 5 years ago
Mohammad Aljammal 11f9daa3ff add PatientSickLeave 5 years ago
Mohammad Aljammal fe66ee5993 fix lab result issues 5 years ago
Mohammad Aljammal 9cf5c80aae add time line and appointment rate 5 years ago
Mohammad Aljammal f5b16734c6 add time line 5 years ago
Mohammad Aljammal 8495260c5a fix issues in feedback 5 years ago
Mohammad Aljammal 2b0e35a907 fix issues in base app client 5 years ago
Mohammad Aljammal a1fa2c0727 done vital sign 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
Mohammad Aljammal 43349542da Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into medical_profile 6 years ago
Mohammad Aljammal 8de50bfe74 medical - my doctor and prescription services and pages 6 years ago
hussam al-habibeh e92cb2e1ac Design and return Pharmacy List 6 years ago
Mohammad Aljammal 93bfcbc20f Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into medical_profile
 Conflicts:
	lib/pages/landing/landing_page.dart
	pubspec.yaml
6 years ago
hussam al-habibeh 31d2816e64 design for search medicine and return medicine list 6 years ago
Mohammad Aljammal fc749de77e create doctor card and medical page 6 years ago
Mohammad Aljammal 198a1854a9 add documentation Mohammad Aljammal and Elham Rababah 6 years ago
Mohammad Aljammal 6d6c71655a add new widget by Elham Rababah and Mohammad Aljammal 6 years ago
Mohammad Aljammal 19676549e1 add base client, landing page, bottom_nav_bar , List Container, List Item, drawer progress indicator and asset file 6 years ago
Mohammad Aljammal 3ed5c3878f init project structure By Mohammad and Elham 6 years ago