tahaalam
|
85f9609cbb
|
Merge remote-tracking branch 'origin/master' into ambulance_service
# Conflicts:
# android/app/libs/PenNavUI.aar
# android/app/libs/Penguin.aar
# android/app/libs/PenguinRenderer.aar
# android/app/src/main/kotlin/com/ejada/hmg/MainActivity.kt
# android/app/src/main/res/values/strings.xml
# android/build/reports/problems/problems-report.html
# ios/Runner/AppDelegate.swift
|
1 week ago |
haroon amjad
|
ede8844f19
|
Monthly Reports implemented
|
1 week ago |
haroon amjad
|
32ee47ca66
|
Merge branch 'master' into haroon_dev
|
1 week ago |
Haroon6138
|
ba211ea4c2
|
Merge pull request 'hospital_filter' (#141) from hospital_filter into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/141
|
1 week ago |
haroon amjad
|
b10d715d55
|
App updates
|
1 week ago |
tahaalam
|
f19d06512a
|
filters changed in region selection bottom sheet
|
2 weeks ago |
haroon amjad
|
05e5b41dc6
|
Merge branch 'master' into haroon_dev
# Conflicts:
# lib/presentation/medical_file/medical_file_page.dart
|
2 weeks ago |
haroon amjad
|
6f067d92d6
|
My invoices implemented
|
2 weeks ago |
Sultan khan
|
d62324044a
|
default appointment load fix
|
2 weeks ago |
Sultan khan
|
dc8031bb41
|
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:
updates
fixed the suggested design changes. (Not reminder ones)
fixed the suggested design changes. (Not reminder ones)
|
2 weeks ago |
Sultan khan
|
f7021f685a
|
no message
|
2 weeks ago |
haroon amjad
|
93979707e4
|
Merge branch 'master' into haroon_dev
|
2 weeks ago |
haroon amjad
|
213662e718
|
updates
|
2 weeks ago |
faizatflutter
|
460e32d25a
|
Merge branch 'master' into faiz_dev
# Conflicts:
# lib/presentation/hmg_services/services_page.dart
|
2 weeks ago |
faizatflutter
|
a29c0dd6bc
|
fixed the suggested design changes. (Not reminder ones)
|
2 weeks ago |
Haroon6138
|
06f6cb1514
|
Merge pull request 'dev_sultan' (#137) from dev_sultan into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/137
|
2 weeks ago |
Sultan khan
|
0895d94df2
|
Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
|
2 weeks ago |
Sultan khan
|
afe169d2d9
|
silent login fix
|
2 weeks ago |
faizatflutter
|
40f6cafb48
|
fixed routing again and again.
|
2 weeks 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 |
faizatflutter
|
f8fdd7570e
|
Merge branch 'master' into faiz_dev
# Conflicts:
# lib/routes/app_routes.dart
# lib/theme/colors.dart
|
2 weeks ago |
faizatflutter
|
0e2de5a55d
|
Completed Graph
|
2 weeks ago |
haroon amjad
|
162337b317
|
Added appointment nearest gate & floor
|
2 weeks ago |
faizatflutter
|
d4dd475e0b
|
Added Graph
|
2 weeks ago |
Sultan khan
|
d55fe5e527
|
Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
|
2 weeks ago |
Sultan khan
|
0e26505692
|
covid page inprogress
|
2 weeks ago |
aamir-csol
|
6c1707128b
|
Merge branch 'master' into dev_aamir
|
2 weeks ago |
aamir-csol
|
3601e39a29
|
Health calculators & converters
|
2 weeks ago |
faizatflutter
|
333046951c
|
Merge branch 'master' into faiz_dev
# Conflicts:
# lib/core/app_assets.dart
# lib/core/dependencies.dart
# lib/main.dart
# lib/routes/app_routes.dart
|
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
|
2 weeks ago |
Sultan khan
|
873b2a1591
|
sorting done, covid inprogress
|
2 weeks ago |
faizatflutter
|
a1aaa041d1
|
Water Intake Final Touches
|
3 weeks ago |
haroon amjad
|
b353de3cf8
|
Merge branch 'master' into haroon_dev
# Conflicts:
# lib/presentation/book_appointment/select_doctor_page.dart
# lib/presentation/book_appointment/widgets/doctor_card.dart
|
3 weeks ago |
aamir-csol
|
54f8391066
|
Merge branch 'master' into dev_aamir
# Conflicts:
# lib/presentation/lab/lab_orders_page.dart
|
3 weeks ago |
aamir-csol
|
135b05e561
|
Health calculators & converters
|
3 weeks ago |
haroon amjad
|
510d82b592
|
Merge branch 'master' into haroon_dev
|
3 weeks ago |
Sultan khan
|
366429f083
|
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:
Health calculators & converters
Health calculators & converters
collapsing_list_view improvement
# Conflicts:
# lib/widgets/appbar/collapsing_list_view.dart
|
3 weeks ago |
haroon amjad
|
3cc2610d30
|
updates
|
3 weeks ago |
haroon amjad
|
f886357bcd
|
updates
|
3 weeks ago |
Sultan khan
|
40638cfec4
|
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:
collapsing_list_view improvement
Updated design for HHC
updates & fixes
QLine API implementation enhancements
LiveCare flow from clinic selection implemented
# Conflicts:
# lib/presentation/home/landing_page.dart
|
3 weeks ago |
faizatflutter
|
fd2abbbc7b
|
Water Intake Design completed
|
3 weeks ago |
haroon amjad
|
87fd9a42b7
|
Nearest Appointment selected
|
4 weeks ago |
faizatflutter
|
94668997aa
|
Updated design for HHC
|
1 month ago |
haroon amjad
|
d8c7503c56
|
QLine API implementation enhancements
|
1 month ago |
Sultan khan
|
70d5b06987
|
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: (45 commits)
Health Calculators
Smartwatch integration started
refactor
Complete UserInfo Selection Module
Complete UserInfo Selection Module
update
Complete USerInfo Selectoiun
Ancillary order fixes, QLine API integrated & other enhancements
Added user_info module IAP
Medical File page updates
Master merged
Services Page Revamp
loading view added
graph shaded region added from horizontal spaces
Refactoring
Appointment Queue implemented, Blood Donation implementation contd.
Integrated the API for Symptoms Checker
Queueing system screen implementation contd.
medical file changes
Added symptoms selector
...
# Conflicts:
# lib/features/authentication/authentication_repo.dart
# lib/features/my_appointments/my_appointments_repo.dart
# lib/features/my_appointments/my_appointments_view_model.dart
# lib/presentation/home/landing_page.dart
|
1 month ago |
haroon amjad
|
d202aa8423
|
Smartwatch integration started
|
1 month ago |
haroon amjad
|
ff98262cf7
|
Merge branch 'master' into haroon_dev
# Conflicts:
# lib/presentation/home/landing_page.dart
|
1 month ago |
Sultan khan
|
f28762a5c5
|
last appointment rated done.
|
1 month ago |
faizatflutter
|
6f72c99975
|
Merge branch 'master' into faiz_dev
# Conflicts:
# lib/presentation/lab/lab_orders_page.dart
# lib/theme/colors.dart
|
1 month ago |
faizatflutter
|
fbe124f6ee
|
Complete UserInfo Selection Module
|
1 month ago |