Commit Graph

172 Commits (72ee34f9a71fba30798db9ad230401d745fdc905)

Author SHA1 Message Date
haroon amjad 6ffa07392c Product detail page updates 3 years ago
haroon amjad c253ec3110 LiveCare UI revamped 3 years ago
haroon amjad be771917f0 pharmacy fixes 3 years ago
Sikander Saleem d6a5f68312 Merge branch 'new_design_sikander' into development_new_design_2.0
# Conflicts:
#	lib/pages/Blood/blood_donation.dart
#	lib/pages/BookAppointment/components/SearchByClinic.dart
3 years ago
Sikander Saleem cd81f05a8d laser clinic design (cont.) 3 years ago
haroon amjad 0853ecdc27 Body added 3 years ago
haroon amjad 1f077f71f8 no message 3 years ago
haroon amjad 983fb55747 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/uitl/translations_delegate_base.dart
3 years ago
haroon amjad 2032053cb7 Working on Health data 3 years ago
Sultan Khan 496c6ce32e registration done 3 years ago
haroon amjad 6511ca8dc7 UI fixes & updates 3 years ago
haroon amjad 07a98d75c6 My tracker fixes 3 years ago
haroon amjad 40cbca565a fixes 3 years ago
haroon amjad 58c78656bf Rating dialog updates 3 years ago
Sultan Khan 5c8b809e39 family file fixes 3 years ago
Haroon Amjad 1fa6a4409b Family files fixes 3 years ago
haroon amjad 829fcd1461 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/ErService/rapid-response-team/rrt-order-list-item.dart
3 years ago
haroon amjad 2c4ff16f0c updates & fixes 3 years ago
Sultan Khan 2c1d7c511e family file changes 3 years ago
haroon amjad 01ca8b8f84 updates & fixes 3 years ago
Sikander Saleem df31c82fd5 doctor header review on tap improvement. 3 years ago
haroon amjad fa8c739b2c updates & fixes 3 years ago
haroon amjad 92bfe27a6e updates & fixes 3 years ago
haroon amjad ec646a7039 My Invoice fixes, Prescription page fixes 3 years ago
haroon amjad 3bb0a8b85b Apple Pay finalized, Translation issues fixed, other updates 3 years ago
Sikander Saleem bdb7f29d4c Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/core/service/parmacyModule/prescription_service.dart
#	lib/pages/BookAppointment/DentalComplaints.dart
#	lib/pages/login/login.dart
3 years ago
Mohammad Aljammal 8abbb04f02 Merge branch 'fatima-new' into 'development'
Fatima new

See merge request Cloud_Solution/diplomatic-quarter!373
3 years ago
haroon amjad e9c26ee85f Dental procedures implemented 3 years ago
Fatimah Alshammari f3b545ff74 fixed products issues 3 years ago
Sikander Saleem 5ab9dd1761 Appointment screen Changes & improvements. 3 years ago
Sikander Saleem 458dc2474b Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/uitl/translations_delegate_base.dart
3 years ago
Sikander Saleem 5647ab75e5 improvements. 3 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
3 years ago
Mirza.Shafique d865e97ce1 Vital Sings Home Page 3 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
3 years ago
Fatimah Alshammari 34ccb132dc fixed issues 3 years ago
Fatimah Alshammari 74d0826342 fixed issues 3 years ago
Mirza.Shafique 66efbc1bac Radiology Implementation 3 years ago
haroon amjad 5c8e9f4e19 Merge branch 'Haroon' into 'development'
Haroon

See merge request Cloud_Solution/diplomatic-quarter!352
3 years ago
haroon amjad 2242b78116 Merge branch 'development' into Haroon
# Conflicts:
#	lib/config/config.dart
3 years ago
haroon amjad e28fdaade1 Dental Invoices implementation completed 3 years ago
Zohaib Iqbal Kambrani f442cc251c Pre Post Images Dental Doctor Profile 3 years ago
haroon amjad a32501f3dc My invoices implementation continued 3 years ago
Sikander Saleem 56c0adaada Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
3 years ago
Zohaib Iqbal Kambrani 429fcb1e60 Merge branch 'development' into ZohaibIqbalKambrani
* development: (32 commits)
  changes
  package name changed
  Jira Fixes
  Jira fixes
  PAP-664
  PAP-664
  PAP-664
  langauge issue
  bug fix
  PAP-777
  PAP-729
  fix button
  fix translate issues
  CONFIG
  PAP-715 : Y –axis and X –axis values should be display in the yearly graph details.
  bug fixes
  fix bugs
  fixing dashboard issue
  fixing dashboard issue
  jira bugs
  ...

# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/core/service/client/base_app_client.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/uitl/utils.dart
3 years ago
Sultan Khan 57864f949d Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development 3 years ago
Sultan Khan bd85854fa4 changes 3 years ago
Zohaib Iqbal Kambrani bf303a7be0 RRT Implementation 3 years ago
haroon amjad 90db04cee1 Jira Fixes 3 years ago
Sikander Saleem f6ae7ed770 merge changes-4 3 years ago
Haroon Amjad 47e521fe1d Merge branch 'development' into Haroon
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/pages/feedback/send_feedback_page.dart
#	lib/pages/landing/home_page.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/widgets/in_app_browser/InAppBrowser.dart
3 years ago
Mirza.Shafique 5dc88f51c3 Home Page 1.0 3 years ago
Haroon Amjad 213d104d57 Covid test procedure selection implemented 3 years ago
Sultan Khan 14ef096c32 changes and fixes 3 years ago
Sultan Khan 3d6858d0ec bug fixes 4 years ago
Sultan Khan 66acce3b40 ancillary order pages added 4 years ago
Sultan Khan b891c1bd80 theme issue 4 years ago
Sultan Khan e61c26b853 Auto SMS, Themes, Voice Command 4 years ago
haroon amjad 6945230965 Merge branch 'development' into Haroon
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/pages/Covid-DriveThru/covid-drivethru-location.dart
#	lib/pages/landing/home_page.dart
#	lib/pages/medical/smart_watch_health_data/health_data_list.dart
#	lib/pages/medical/smart_watch_health_data/smart_watch_instructions.dart
#	lib/uitl/translations_delegate_base.dart
#	pubspec.yaml
4 years ago
Mohammad Aljammal de1b7cc1d0 fix merge issues 4 years ago
Mohammad Aljammal 3fb522e15f Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_merge
 Conflicts:
	lib/config/config.dart
	lib/config/localized_values.dart
	lib/config/shared_pref_kay.dart
	lib/core/model/pharmacies/LakumInquiryInformationObjVersion.dart
	lib/core/model/pharmacies/order_model.dart
	lib/core/viewModels/pharmacyModule/PharmacyAddressesViewModel.dart
	lib/core/viewModels/pharmacyModule/order_model_view_model.dart
	lib/locator.dart
	lib/main.dart
	lib/pages/landing/landing_page_pharmcy.dart
	lib/pages/parent_categorise_page.dart
	lib/pages/pharmacies/screens/cart-order-page.dart
	lib/pages/pharmacies/screens/cart-order-preview.dart
	lib/pages/pharmacies/screens/pharmacy_module_page.dart
	lib/pages/pharmacies/wishlist.dart
	lib/pages/pharmacy/order/Order.dart
	lib/pages/pharmacy/order/OrderDetails.dart
	lib/pages/pharmacy/order/ProductReview.dart
	lib/pages/pharmacy/pharmacyAddresses/AddAddress.dart
	lib/pages/pharmacy/pharmacyAddresses/PharmacyAddresses.dart
	lib/pages/pharmacy/profile/profile.dart
	lib/services/pharmacy_services/orderDetails_service.dart
	lib/services/pharmacy_services/order_service.dart
	lib/services/pharmacy_services/pharmacyAddress_service.dart
	lib/services/pharmacy_services/wishList_service.dart
	lib/uitl/translations_delegate_base.dart
	lib/widgets/buttons/borderedButton.dart
	lib/widgets/others/app_scaffold_widget.dart
	lib/widgets/pharmacy/product_tile.dart
4 years ago
enadhilal 10734d5994 connecting pages.
trnaslate.
calling API.
review page.
product details page.
Wishlist page.
Brands page.
4 years ago
Mohammad Aljammal 519a474d41 fix live care label and vital sign data 4 years ago
haroon amjad 051bd1e23f Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 4 years ago
haroon amjad 33956db22a Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
#	lib/config/config.dart
4 years ago
haroon amjad b55681a056 Working on steps tracking 4 years ago
Mohammad Aljammal a1e92e1fdd fix merge issue 4 years ago
Mohammad Aljammal 9fecf8e89f fix insurance update 4 years ago
haroon amjad cf6686e413 Merge branch 'master' into Haroon
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/Covid-DriveThru/covid-drivethru-location.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
enadhilal c22ca4e29e Merge branch 'pharmacy' into enad_pharmacy2
# Conflicts:
#	lib/config/config.dart
#	lib/core/service/client/base_app_client.dart
#	lib/locator.dart
#	lib/pages/base/base_view.dart
#	lib/pages/landing/home_page.dart
#	lib/widgets/others/app_scaffold_widget.dart
#	lib/widgets/pharmacy/product_tile.dart
4 years ago
enadhilal 888a74fb9b add these pages
​Product Tile Component
Product Detail Page
​Wishlist Page
​Reviews Page
Brands Page + Search
4 years ago
haroon amjad 7edb0c8009 Doctor rating dialog revamped 4 years ago
mosazaid 98f660e29b Merge branch 'pharmacy' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_module_feature_home_page
 Conflicts:
	lib/config/config.dart
	lib/config/localized_values.dart
	lib/core/service/client/base_app_client.dart
	lib/locator.dart
	lib/uitl/translations_delegate_base.dart
	lib/widgets/others/app_scaffold_widget.dart
4 years ago
mosazaid 4e5d6a9a00 finish pharmacy home page , cart page, orders and payment page, recently viewed , and lakum module almost finished 4 years ago
Sultan Khan 91be66ecdd family file changes 4 years ago
Sultan Khan a16145d7f1 bugfixes 4 years ago
Sultan Khan f05b235cd0 login issue 4 years ago
haroon amjad 6062716209 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 4 years ago
Mohammad Aljmma 9880b0236b fix my family issues 4 years ago
haroon amjad 4f53d058d4 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 4 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
4 years ago
Mohammad Aljammal 29f0402cbd Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
 Conflicts:
	lib/config/config.dart
	lib/config/shared_pref_kay.dart
	lib/core/service/client/base_app_client.dart
	lib/pages/AlHabibMedicalService/​ health_calculators.dart
	lib/pages/ContactUs/LiveChat/hospitalsLivechat_page.dart
	lib/pages/MyAppointments/widgets/AppointmentCardView.dart
	lib/pages/login/confirm-login.dart
	lib/pages/login/login.dart
	lib/services/appointment_services/GetDoctorsList.dart
	lib/uitl/translations_delegate_base.dart
	lib/widgets/drawer/app_drawer_widget.dart
	lib/widgets/others/app_scaffold_widget.dart
4 years ago
haroon amjad 41d50e23e3 covid drivethru implemented 4 years ago
haroon amjad 929e289a6f started implementing Covid-19 DriveThru Test Module 4 years ago
haroon amjad 7fdc0da9dc livecare scheduling implemented 4 years ago
haroon amjad c9256a654a LiveCare Scheduling updates 4 years ago
Sultan Khan a98bc226e6 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Sultan Khan 0f63b922d1 speech to text 4 years ago
Mohammad Aljammal b0f0b87345 fix merge issues 4 years ago
Mohammad Aljammal 68466c8d03 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into dashboard
 Conflicts:
	lib/config/localized_values.dart
	lib/core/service/client/base_app_client.dart
	lib/models/Appointments/DoctorListResponse.dart
	lib/pages/BookAppointment/widgets/DoctorView.dart
	lib/pages/MyAppointments/MyAppointments.dart
	lib/uitl/translations_delegate_base.dart
	pubspec.yaml
4 years ago
haroon amjad 3e5ef26b29 my appointment sorting implemented 4 years ago
haroon amjad 51078227ab Dental appointment flow implemented 4 years ago
haroon amjad 1886f3a763 implementing Dental Appointment flow 4 years ago
Mohammad Aljammal ef4a57223c fix DoctorView.dart UI issues 4 years ago
haroon amjad a7f5dfab5c fixes 4 years ago
haroon amjad 35cd02494c implemented search by doctor list 4 years ago
haroon amjad 13adb46319 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
#	lib/config/localized_values.dart
#	lib/config/shared_pref_kay.dart
4 years ago
haroon amjad f669adcb9d Location service implemented 4 years ago
Mohammad Aljammal 01a011a03d done dashboard page 4 years ago
haroon amjad 5f1413a2ac implementing Twilio in LiveCare 4 years ago