aamir-csol
a816afadea
Merge branch 'master' into dev_aamir
...
# Conflicts:
# lib/core/dependencies.dart
# lib/presentation/hmg_services/services_page.dart
10 months ago
aamir-csol
d76ff5828f
fixes
10 months ago
haroon amjad
8f428297cb
Arabic translations added
10 months ago
haroon amjad
a0008c9104
Nearest Appointment sorting fixed
10 months ago
Fatimah.Alshammari
1d224702ac
Merge branch 'refs/heads/master' into fatima
10 months ago
Fatimah.Alshammari
69666a6f6c
fixed button
10 months ago
haroon amjad
475a9b9acb
Merge branch 'master' into haroon_dev
10 months ago
Haroon6138
06c67a0409
Merge pull request 'dev_aamir' ( #153 ) from dev_aamir into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/153
10 months ago
Sultan khan
0ddaa6899d
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 :
fixed parking qr
added parking part
added monthly report
added monthly report
added monthly report
fix error
monthly report
fix toggle
fix toggle
active medication
active medication
active medication
10 months ago
Sultan khan
42222804fd
fix graph dot and bp graph.
10 months ago
aamir-csol
bf210e664d
Merge branch 'master' into dev_aamir
10 months ago
aamir-csol
6725ab028d
doctor search filter design update & switch user bug fix.
10 months ago
haroon amjad
609ae6ab83
updates
10 months ago
haroon amjad
344adf23c0
Merge branch 'master' into haroon_dev
...
# Conflicts:
# lib/core/dependencies.dart
# lib/main.dart
# lib/presentation/hmg_services/services_page.dart
# lib/presentation/home/landing_page.dart
10 months ago
haroon amjad
44ce353dac
updates
10 months ago
Fatimah.Alshammari
250af1506c
Merge branch 'master' into fatima
...
# Conflicts:
# lib/core/dependencies.dart
# lib/presentation/medical_file/medical_file_page.dart
# lib/routes/app_routes.dart
# lib/services/dialog_service.dart
# lib/theme/colors.dart
10 months ago
haroon amjad
fc750174fe
Merge branch 'master' into haroon_dev
10 months ago
haroon amjad
d848291930
updates
10 months ago
Haroon6138
aee496b7c3
Merge pull request 'dev_sultan' ( #151 ) from dev_sultan into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/151
10 months ago
Sultan khan
16da0f4d0a
Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
10 months ago
Sultan khan
8ee0e3b4ea
no message
10 months ago
Sultan khan
0c68ca4438
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 :
Added 'send report to email' feature
Completed the health Tracker Module, Only the email part is left.
only explain api left.
Triage Completed. Explain API left
Till Triage Completed
refactoring
# Conflicts:
# lib/presentation/medical_file/medical_file_page.dart
10 months ago
haroon amjad
e454c9c991
Merge branch 'master' into haroon_dev
...
# Conflicts:
# lib/core/api_consts.dart
# lib/core/dependencies.dart
10 months ago
Haroon6138
96ebc3c7e9
Merge pull request 'dev_aamir' ( #149 ) from dev_aamir into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/149
10 months ago
Sultan khan
0514716910
no message
10 months ago
Sultan khan
e903f9c418
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 :
search filter on select doctor page.
family file fix
blood group
10 months ago
Sultan khan
ac0d72b3ff
vital sign finalized.
10 months ago
aamir-csol
c11e859df1
search doctor by name filter.
10 months ago
faizatflutter
ff2bcbae3f
Merge branch 'master' into faiz_dev
...
# Conflicts:
# lib/core/api_consts.dart
# lib/core/dependencies.dart
# lib/main.dart
10 months ago
faizatflutter
001808488c
Added 'send report to email' feature
10 months ago
haroon amjad
91c16f13d1
Merge branch 'master' into haroon_dev
...
# Conflicts:
# lib/core/app_assets.dart
10 months ago
haroon amjad
1c0842ab95
updates
10 months ago
aamir-csol
83f04bc0e6
search filter on select doctor page.
10 months ago
faizatflutter
3f5bd0a759
Completed the health Tracker Module, Only the email part is left.
10 months ago
aamir-csol
38d8341963
family file fix
10 months ago
aamir-csol
c7e4018ddc
Merge branch 'master' into dev_aamir
...
# Conflicts:
# lib/presentation/appointments/widgets/hospital_bottom_sheet/hospital_bottom_sheet_body.dart
10 months ago
aamir-csol
b815affe5c
blood group
10 months ago
haroon amjad
02930a901e
Indoor navigation implementation & Landing page swiper card updates
10 months ago
Fatimah.Alshammari
20e4f82df3
Merge branch 'master' into fatima
...
# Conflicts:
# lib/core/dependencies.dart
# lib/main.dart
# lib/presentation/hmg_services/services_page.dart
# lib/presentation/medical_file/medical_file_page.dart
# lib/routes/app_routes.dart
10 months ago
Fatimah.Alshammari
8ae81d2b24
fixed parking qr
10 months ago
Sultan khan
34e8386ca1
Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
10 months ago
Sultan khan
cc255e9c9a
vital sign detail page
10 months ago
haroon amjad
1656ca58c1
Merge branch 'ambulance_service' into haroon_dev
10 months ago
haroon amjad
685eec6a52
updates & fixes
10 months ago
haroon amjad
d6b1744176
updates
10 months ago
tahaalam
699ef2f672
Merge remote-tracking branch 'origin/ambulance_service' into ambulance_service
...
# Conflicts:
# android/settings.gradle.kts
10 months ago
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
10 months ago
haroon amjad
ede8844f19
Monthly Reports implemented
10 months ago
faizatflutter
17f32e34d3
Merge branch 'refs/heads/master' into faiz_dev
...
# Conflicts:
# lib/presentation/symptoms_checker/user_info_selection.dart
10 months ago
haroon amjad
255353dd21
Bottom nav updates
10 months ago
faizatflutter
4ee0d1d3c8
only explain api left.
10 months ago
faizatflutter
8c91b6830a
Triage Completed. Explain API left
10 months ago
haroon amjad
e9dd2f0648
updates
10 months ago
haroon amjad
210da3404c
updates
10 months ago
haroon amjad
32ee47ca66
Merge branch 'master' into haroon_dev
10 months 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
10 months ago
haroon amjad
b10d715d55
App updates
10 months ago
tahaalam
f19d06512a
filters changed in region selection bottom sheet
10 months ago
faizatflutter
49d091547a
Till Triage Completed
10 months ago
haroon amjad
05e5b41dc6
Merge branch 'master' into haroon_dev
...
# Conflicts:
# lib/presentation/medical_file/medical_file_page.dart
10 months ago
haroon amjad
6f067d92d6
My invoices implemented
10 months ago
Sultan khan
d62324044a
default appointment load fix
10 months 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)
10 months ago
Sultan khan
f7021f685a
no message
10 months ago
faizatflutter
597579e677
refactoring
10 months ago
haroon amjad
93979707e4
Merge branch 'master' into haroon_dev
10 months ago
haroon amjad
213662e718
updates
10 months ago
faizatflutter
57f693e0d9
fixed the suggested design changes. (Not reminder ones)
10 months ago
faizatflutter
460e32d25a
Merge branch 'master' into faiz_dev
...
# Conflicts:
# lib/presentation/hmg_services/services_page.dart
10 months ago
faizatflutter
a29c0dd6bc
fixed the suggested design changes. (Not reminder ones)
10 months 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
10 months ago
Sultan khan
0895d94df2
Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
10 months ago
Sultan khan
afe169d2d9
silent login fix
10 months ago
faizatflutter
40f6cafb48
fixed routing again and again.
10 months ago
faizatflutter
81e0680cb3
fixed routing again and again.
10 months ago
Sultan khan
449c693fdb
Merge branch 'refs/heads/faiz_dev' into dev_sultan
...
# Conflicts:
# lib/presentation/book_appointment/laser/laser_appointment.dart
10 months ago
faizatflutter
f8fdd7570e
Merge branch 'master' into faiz_dev
...
# Conflicts:
# lib/routes/app_routes.dart
# lib/theme/colors.dart
10 months ago
faizatflutter
0e2de5a55d
Completed Graph
10 months ago
haroon amjad
e9590a15d3
updates & fixes
10 months ago
haroon amjad
162337b317
Added appointment nearest gate & floor
10 months ago
Fatimah.Alshammari
11de01e079
Merge branch 'refs/heads/master' into fatima
...
# Conflicts:
# lib/presentation/hmg_services/services_page.dart
# lib/routes/app_routes.dart
# lib/theme/colors.dart
10 months ago
Fatimah.Alshammari
62bb667cb8
added parking part
10 months ago
faizatflutter
d4dd475e0b
Added Graph
10 months ago
Sultan khan
d55fe5e527
Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
10 months ago
Sultan khan
0e26505692
covid page inprogress
10 months ago
aamir-csol
6c1707128b
Merge branch 'master' into dev_aamir
10 months ago
aamir-csol
3601e39a29
Health calculators & converters
10 months 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
10 months 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
10 months ago
Sultan khan
873b2a1591
sorting done, covid inprogress
10 months ago
faizatflutter
a1aaa041d1
Water Intake Final Touches
10 months 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
10 months ago
haroon amjad
dcdd17f0e9
sickleave fix
10 months ago
aamir-csol
54f8391066
Merge branch 'master' into dev_aamir
...
# Conflicts:
# lib/presentation/lab/lab_orders_page.dart
10 months ago
aamir-csol
135b05e561
Health calculators & converters
10 months ago
haroon amjad
510d82b592
Merge branch 'master' into haroon_dev
10 months 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
10 months ago
haroon amjad
3cc2610d30
updates
10 months ago
haroon amjad
f886357bcd
updates
10 months ago
Fatimah.Alshammari
f3674ba06f
Merge branch 'refs/heads/master' into fatima
...
# Conflicts:
# lib/core/dependencies.dart
# lib/presentation/hmg_services/services_page.dart
# lib/routes/app_routes.dart
10 months ago