Commit Graph

12 Commits (ff2bcbae3f5e54623c74e5da80a0da25c0146a6c)

Author SHA1 Message Date
aamir-csol b815affe5c blood group 5 days ago
Sultan khan 449c693fdb Merge branch 'refs/heads/faiz_dev' into dev_sultan
# Conflicts:
#	lib/presentation/book_appointment/laser/laser_appointment.dart
2 weeks ago
haroon amjad 162337b317 Added appointment nearest gate & floor 2 weeks ago
Sultan khan 0e26505692 covid page inprogress 2 weeks ago
Sultan khan 6ceee6973f Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
* 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New:
  sickleave fix
  Health calculators & converters
  updates
  updates
  updates
  updates
  Nearest Appointment selected

# Conflicts:
#	lib/presentation/lab/lab_orders_page.dart
3 weeks ago
Sultan khan 873b2a1591 sorting done, covid inprogress 3 weeks ago
aamir-csol 135b05e561 Health calculators & converters 3 weeks ago
haroon amjad 796aeb03d3 Ancillary order fixes, QLine API integrated & other enhancements 1 month ago
faizatflutter 21be3a2d06 Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/core/utils/utils.dart
#	lib/presentation/book_appointment/laser/widgets/body_part_listing.dart
#	lib/widgets/buttons/custom_button.dart
#	lib/widgets/common_bottom_sheet.dart
#	lib/widgets/input_widget.dart
3 months ago
faizatflutter eabfaf8182 Design Updates 3 months ago
tahaalam baf7cf0ea0 dental routing fixed and laser exception removed 3 months ago
tahaalam ea92a0c75c laser appointment screen added 3 months ago