Commit Graph

488 Commits (efced34ffa002d398eae4c08185eb2bc6e829e44)

Author SHA1 Message Date
Sikander Saleem df31c82fd5 doctor header review on tap improvement. 4 years ago
Sikander Saleem 5410b826c3 prescriptions new ui updated. 4 years ago
haroon amjad 89e1aa70c0 updates 4 years ago
Sikander Saleem df32ae0142 lab order clinic/hospital name, prescription reminder ui, prescription availibility 4 years ago
Sikander Saleem 3403e07aba recall prescription order log when refill or cancel order. 4 years ago
Haroon Amjad 062ca5c11c EReferral fixes 4 years ago
Haroon Amjad abcb71e86e Invoice details UI revamped 4 years ago
haroon amjad dfeb249a54 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad a4a2389a78 updates & fixes 4 years ago
Sultan Khan fc9f2fc34e Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 4 years ago
Sultan Khan 08933632d3 tracker services done rrt in progress 4 years ago
haroon amjad 184942e891 Covid Payment fixes 4 years ago
Mirza.Shafique 9b160958bb Covid New Design 3 4 years ago
haroon amjad 0955a22616 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad fa8c739b2c updates & fixes 4 years ago
Mirza.Shafique ef8006efd8 Merge branch 'mirza_home_page' into development_new_design_2.0
# Conflicts:
#	lib/pages/Covid-DriveThru/Covid-TimeSlots.dart
#	lib/pages/Covid-DriveThru/covid-dirvethru-questions.dart
#	lib/pages/Covid-DriveThru/covid-payment-alert.dart
#	lib/pages/Covid-DriveThru/covid-payment-details.dart
#	lib/pages/Covid-DriveThru/covid-payment-summary.dart
4 years ago
Mirza.Shafique 5b330b2a25 Covid New Design 4 years ago
Sikander Saleem 9f8bcc63f3 Merge branch 'new_design_sikander' into development_new_design_2.0
# Conflicts:
#	lib/pages/medical/prescriptions/prescriptions_history_details_page.dart
4 years ago
Sikander Saleem 4ce941e01e prescription order log detail view change on arabic 4 years ago
haroon amjad f55fbd1cc2 UI fixes 4 years ago
haroon amjad 4b1a2d4f3d Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/ContactUs/findus/hospitrals_page.dart
#	lib/pages/Covid-DriveThru/covid-drivethru-location.dart
4 years ago
haroon amjad a075d53dd5 UI updates & fixes 4 years ago
Sikander Saleem 7b8093b7ba Merge branch 'new_design_sikander' into development_new_design_2.0 4 years ago
Sikander Saleem c1b23b7c2a improvements 4 years ago
Mirza.Shafique e24eaa791b Merge branch 'mirza_home_page' into development_new_design_2.0 4 years ago
Mirza.Shafique 5b47aaac6f icon and find us distance 4 years ago
haroon amjad 728c22cc68 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/insurance/insurance_approval_screen.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
Sikander Saleem 4a30c59f83 Merge branch 'new_design_sikander' into development_new_design_2.0 4 years ago
Sikander Saleem e37781c3a6 insurance approval screen and detail screen ui changes. 4 years ago
haroon amjad ba7d0329c3 Dental Invoices UI 4 years ago
haroon amjad af7b27258c Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
Sultan Khan 0e43ca173a Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 4 years ago
Sultan Khan d535cb421d bug fixes 4 years ago
haroon amjad f9b57ce4aa Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad 4ac0845003 updates & fixes 4 years ago
Mirza.Shafique 719cdbd2e4 Merge branch 'mirza_home_page' into development_new_design_2.0 4 years ago
Mirza.Shafique 8a4cf9f23b Line Chart Fix in Vital Signs 4 years ago
Sikander Saleem baf4eab604 prescription order detail ui changes 4 years ago
haroon amjad bbcf22ddfa Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/landing/fragments/home_page_fragment2.dart
4 years ago
Sikander Saleem d9405b2bd0 prescription order log ui changes 4 years ago
Sikander Saleem 8e27d8210a prescription detail ui changes. 4 years ago
haroon amjad ad3463bbfc active medication design revamped 4 years ago
haroon amjad bf4709fef6 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/medical/prescriptions/prescription_details_page.dart
4 years ago
Sikander Saleem 9d67704c67 prescription detail ui changes(cont). 4 years ago
haroon amjad a2e25f7a7a Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
Sikander Saleem 4e0197965c prescription ui changes(cont). 4 years ago
Mirza.Shafique 999a45c711 App Expendable Design Change 4 years ago
haroon amjad b1128be94f Updates & fixes 4 years ago
haroon amjad 7467da7409 Imports organized 4 years ago
Mirza.Shafique d7314f7555 Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0 4 years ago
Mirza.Shafique 96b971ef01 CMC 1.6 4 years ago
haroon amjad f946a7be4d updates & fixes 4 years ago
Sultan Khan 4d00664045 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0 4 years ago
Sultan Khan c6404a2a0b tracker services 4 years ago
haroon amjad f795ba24c5 updates & fixes 4 years ago
haroon amjad f33272f8d9 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0 4 years ago
haroon amjad ec646a7039 My Invoice fixes, Prescription page fixes 4 years ago
Sultan Khan 2019e804f0 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0 4 years ago
haroon amjad aadcfdc7bc Insurance Approval fixes 4 years ago
haroon amjad 5396138962 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0
# Conflicts:
#	lib/pages/ToDoList/payment_method_select.dart
#	lib/pages/medical/balance/confirm_payment_page.dart
4 years ago
haroon amjad 3bb0a8b85b Apple Pay finalized, Translation issues fixed, other updates 4 years ago
Mirza.Shafique afb08fcd0a Booking Filters Update 4 years ago
Mirza.Shafique 3af1676730 Merge branch 'development_new_design_2.0' into mirza_home_page
# Conflicts:
#	lib/pages/insurance/insurance_card_screen.dart
#	lib/pages/medical/balance/advance_payment_page.dart
#	lib/pages/medical/balance/confirm_payment_page.dart
4 years ago
Mirza.Shafique a234618df8 Update, Insurance card and My Balance Design 4 years ago
haroon amjad ebcc2559ce Ask doctor issue resolved, Translation & font family issues resolved 4 years ago
haroon amjad 25fb5decc0 Ask Doctor page fixes 4 years ago
haroon amjad 106489b085 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0 4 years ago
haroon amjad d4a4165ef3 Minor fixes in Eye Measurements 4 years ago
Sultan Khan 671c432cd7 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0 4 years ago
Sultan Khan 0086875d0d Design Updated for tracker 4 years ago
Sikander Saleem a09b43ef8c monthly report ui redesigned. 4 years ago
Sikander Saleem c84707ba3f monthly report request & sick leaves ui redesigned. 4 years ago
Sultan Khan d2d22ff1fc Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0 4 years ago
Sultan Khan 73ff5c4707 Bug fixes 4 years ago
Sikander Saleem d9c1b8b8ea Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
#	lib/main.dart
#	lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
#	lib/pages/landing/landing_page.dart
#	lib/pages/medical/ask_doctor/ask_doctor_home_page.dart
#	lib/pages/medical/eye/EyeMeasurementsPage.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/uitl/utils.dart
4 years ago
haroon amjad 4469ae1209 updates & fixes 4 years ago
Sikander Saleem ef5f737084 Merge branch 'development' into development_new_design_2.0 4 years ago
Mirza.Shafique 4f85652562 Merge branch 'mirza_home_page' into development_new_design_2.0 4 years ago
Mirza.Shafique f577905dcb eye measurment new design 4 years ago
haroon amjad e679c7df0d updates & fixes 4 years ago
Sikander Saleem 62ca009404 improvement. 4 years ago
Sikander Saleem 1c020134e8 Merge branch 'new_design_sikander' into development_new_design_2.0 4 years ago
Mirza.Shafique 089ad0d321 Booking appointment 1.3 4 years ago
Sikander Saleem cfa3ca62b6 prescription tab bar improvement. 4 years ago
Sikander Saleem 3cc18cfb24 medical reports ui redesigned. 4 years ago
Sikander Saleem 9fdebc2db7 ask doctor ui redesigned 4 years ago
Sikander Saleem 6191377914 Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/pages/login/login.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/widgets/data_display/medical/LabResult/LabResultWidget.dart
#	lib/widgets/data_display/medical/LabResult/laboratory_result_widget.dart
4 years ago
Mohammad Aljammal 8b3a0b3ada Revert "Merge branch 'foote_in_all_pages' into 'development'"
This reverts merge request !369
4 years ago
Sikander Saleem d605084a91 appointment list and detail ui changed 4 years ago
haroon amjad 0d1d68273b Covid passport CR implemented in Covid test flow 4 years ago
haroon amjad 72dbdd2c2b Merge branch 'development' into Haroon 4 years ago
haroon amjad e96157c74a Covid certificate passport CR implemented 4 years ago
Sikander Saleem 970887b0c5 changes 4 years ago
Elham Rababh ceeda154d5 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into foote_in_all_pages
 Conflicts:
	lib/pages/landing/landing_page.dart
4 years ago
Sikander Saleem bb18645d85 Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart
#	lib/pages/MyAppointments/AppointmentDetails.dart
#	lib/pages/landing/landing_page.dart
#	lib/pages/medical/medical_profile_page.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
Mirza.Shafique ca3495d71c Merge branch 'mirza_home_page' into development_new_design_2.0 4 years ago
Sultan Khan 59892870e2 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 4 years ago
Sultan Khan 9e31a3c560 bug fixes 4 years ago
Sikander Saleem 5ab9dd1761 Appointment screen Changes & improvements. 4 years ago
Mirza.Shafique 374a14eac4 Merge branch 'development_new_design_2.0' into mirza_home_page 4 years ago
Mirza.Shafique 2a4e0a604a Medical Perscription 1.1 4 years ago
Mohammad Aljammal db128e5091 Merge branch 'blood_pressure' into 'development'
fix prescription add reminder

See merge request Cloud_Solution/diplomatic-quarter!363
4 years ago
Elham Rababh 13737548bb Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into foote_in_all_pages 4 years ago
Sikander Saleem 458dc2474b Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/uitl/translations_delegate_base.dart
4 years ago
Sikander Saleem 047941fffc Merge branch 'new_design_sikander' into development_new_design_2.0 4 years ago
Elham Rababh ab2fc6aa2c fix issues related to footer 4 years ago
hussam al-habibeh 428b45528b fix prescription add reminder 4 years ago
Mirza.Shafique 8c8a9c7ce2 Medical Perscription 1.0 4 years ago
Sikander Saleem 350ff20a1a my doctor screen. 4 years ago
Mirza.Shafique 24b7a8a4c4 Merge branch 'mirza_home_page' into development_new_design_2.0 4 years ago
Sikander Saleem 6c8f1c6185 merge improvement. 4 years ago
Mirza.Shafique cbadcd5feb Vital Sings Detail Page 1.0 4 years ago
Sikander Saleem 197e7d5742 Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/medical/patient_sick_leave_page.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/uitl/utils.dart
4 years ago
Elham Rababh f85c359cf4 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into foote_in_all_pages
 Conflicts:
	lib/pages/landing/landing_page.dart
4 years ago
Elham Rababh 69df61afb1 remove footer from pharmacy pages 4 years ago
Mirza.Shafique e91cf4762a Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0 4 years ago
Mirza.Shafique d865e97ce1 Vital Sings Home Page 4 years ago
Fatimah Alshammari 787b55a803 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new
# Conflicts:
#	lib/pages/medical/my_trackers/blood_pressure/AddBloodPressurePage.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
Mohammad Aljammal d9fabbab17 Fix feedback 4 years ago
Fatimah Alshammari 74d0826342 fixed issues 4 years ago
hussam al-habibeh b9d4195e20 Blood pressure translation issue 4 years ago
Sultan khan 3c2a89cd8e Merge branch 'Aug_fixes' into 'development'
fix issues related to wight and  sugar blood

See merge request Cloud_Solution/diplomatic-quarter!354
4 years ago
Elham Rababh 8629b62fcb fix issue 4 years ago
Elham Rababh 1568698b98 fix issues related to wight and sugar blood 4 years ago
Sikander Saleem 6ee56cba0d Merge branch 'login_design_sikander' into development_new_design_2.0
# Conflicts:
#	lib/widgets/data_display/medical/doctor_card.dart
#	lib/widgets/new_design/doctor_header.dart
4 years ago
Sikander Saleem bb20d65b40 lab result detail screen. 4 years ago
Mirza.Shafique 66efbc1bac Radiology Implementation 4 years ago
Mirza.Shafique 26c30038c9 Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0 4 years ago
Mirza.Shafique 29fd552874 Weight, height and blood pressure on Home Page 4 years ago
Sikander Saleem 3a1af590ff lab result detail screen (cont.) 4 years ago
hussam al-habibeh 0a3c44b5e8 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into medication_availability
 Conflicts:
	lib/config/localized_values.dart
	lib/uitl/translations_delegate_base.dart
4 years ago
Elham Rababh 8626b4f269 first step from add footer for all pages 4 years ago
haroon amjad e28fdaade1 Dental Invoices implementation completed 4 years ago
Sikander Saleem 5b778f0493 appointment ui (cont.) & improvement. 4 years ago
haroon amjad a32501f3dc My invoices implementation continued 4 years ago
Sikander Saleem 56c0adaada Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
4 years ago
Sikander Saleem 4db432b351 lab results working(cont.) & improvements 4 years ago
hussam al-habibeh d3868844de Medication availability 4 years ago
haroon amjad 709877b5f1 Merge branch 'development' into Haroon
# Conflicts:
#	lib/pages/login/forgot-password.dart
#	lib/pages/medical/radiology/radiology_details_page.dart
4 years ago
haroon amjad 90db04cee1 Jira Fixes 4 years ago
Sikander Saleem 083d696c62 Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/landing/landing_page.dart
#	lib/pages/login/login.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
Mirza.Shafique 32e867421f Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0
# Conflicts:
#	lib/uitl/date_uitl.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
hussam al-habibeh 02df6f4d85 PAP-664 4 years ago
hussam al-habibeh 60aaf2a31a Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-bugs
 Conflicts:
	lib/pages/medical/my_trackers/blood_pressure/AddBloodPressurePage.dart
4 years ago
Mirza.Shafique bbaeec5b85 Medical Profile Complete 4 years ago
Sikander Saleem f6ae7ed770 merge changes-4 4 years ago
Sikander Saleem 889ae24f07 merge changes-3 4 years ago
Sikander Saleem c07a8f54c7 merge changes-2 4 years ago
Sikander Saleem 14561d0ac6 merge changes-1 4 years ago
Sultan Khan c9fe036b99 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 4 years ago