aamir-csol
|
288a0018ce
|
family screen & widgets
|
1 month ago |
 haroon amjad
|
5f43063f2d
|
Merge branch 'master' into haroon_dev
# Conflicts:
# lib/core/app_assets.dart
|
1 month ago |
|
haroon amjad
|
6b28b57307
|
empty state implementation contd.
|
1 month ago |
 tahaalam
|
b05b03a6f6
|
divider changed
|
1 month ago |
|
tahaalam
|
512628fb8b
|
Lab result view along with the listing of items is added
|
1 month ago |
|
aamir-csol
|
36193d349c
|
Merge remote-tracking branch 'origin/dev_sultan' into dev_aamir
# Conflicts:
# lib/features/authentication/authentication_repo.dart
# lib/features/authentication/authentication_view_model.dart
# lib/features/medical_file/medical_file_view_model.dart
|
1 month ago |
|
aamir-csol
|
02433e1bef
|
family screen & widgets
|
1 month ago |
Haroon Amjad
|
62e82a7a31
|
Empty data state implementation contd.
|
1 month ago |
Sultan khan
|
e2188b5a69
|
switch family member with super user
|
1 month ago |
faizatflutter
|
dc16a684c5
|
Merge branch 'master' into faiz_dev
|
1 month ago |
|
faizatflutter
|
94313b8870
|
Improved Error Handling
|
1 month ago |
|
haroon amjad
|
918eb18b5f
|
Region flow in select clinic implemented
|
1 month ago |
|
haroon amjad
|
a07369165d
|
Updates
|
1 month ago |
|
Sultan khan
|
318441c77f
|
Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
|
1 month ago |
|
aamir-csol
|
45a1ce9254
|
Merge branch 'master' into dev_aamir
|
1 month ago |
|
haroon amjad
|
f7e26da6f4
|
Merge branch 'master' into haroon_dev
|
1 month ago |
|
haroon amjad
|
344ecaba18
|
LiveCare Schedule implementation done
|
1 month ago |
|
Sultan khan
|
3642523fdf
|
Merge branch 'dev_aamir' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
# lib/features/medical_file/medical_file_view_model.dart
|
1 month ago |
 Sikander Saleem
|
7c90d966c1
|
improvement
|
1 month ago |
|
Sikander Saleem
|
604e503e52
|
flow improvement & translation added.
|
1 month ago |
|
aamir-csol
|
9e8011c34c
|
family screen & widgets
|
1 month ago |
|
Sultan khan
|
3acd549de7
|
no message
|
1 month ago |
|
aamir-csol
|
9b33745a57
|
Merge branch 'master' into dev_aamir
|
1 month ago |
|
aamir-csol
|
47ce5022d3
|
family screen & widgets
|
1 month ago |
|
haroon amjad
|
b1af9e1779
|
Merge branch 'master' into haroon_dev
|
1 month ago |
|
haroon amjad
|
a711d3a6dd
|
LiveCare shcedule implementation contd.
|
1 month ago |
|
Sikander Saleem
|
c553876c8a
|
Merge branch 'refs/heads/master' into dev_sikander
|
1 month ago |
|
Sikander Saleem
|
96cc15a441
|
improvements.
|
1 month ago |
|
Sikander Saleem
|
c35c38aeb1
|
onboarding screen added.
|
1 month ago |
|
aamir-csol
|
1b652f877d
|
Merge branch 'master' into dev_aamir
# Conflicts:
# lib/presentation/medical_file/medical_file_page.dart
# lib/widgets/chip/app_custom_chip_widget.dart
|
1 month ago |
|
Sultan khan
|
d5bd99f525
|
Merge branch 'dev_aamir' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
# lib/presentation/medical_file/medical_file_page.dart
|
1 month ago |
|
Haroon6138
|
938d95cb06
|
Merge pull request 'feature/search_by_region' (#55) from feature/search_by_region into master
Reviewed-on: #55
|
1 month ago |
|
aamir-csol
|
192d617350
|
family screen & widgets
|
1 month ago |
|
aamir-csol
|
e48e98d61b
|
Merge branch 'master' into dev_aamir
|
1 month ago |
|
Sultan khan
|
12447cdafb
|
no message
|
1 month ago |
|
Sultan khan
|
32c7608c83
|
Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
|
1 month ago |
|
Sultan khan
|
6d85227f11
|
lab order by test
|
1 month ago |
taha.alam
|
8621a525a2
|
Merge remote-tracking branch 'origin/master' into feature/search_by_region
|
1 month ago |
|
taha.alam
|
7093a26cb8
|
selection region arabic handling
|
1 month ago |
|
taha.alam
|
27a0632d6d
|
directional padding and alignment
|
1 month ago |
|
taha.alam
|
92c3033087
|
Merge remote-tracking branch 'origin/master' into functionality/graph
|
1 month ago |
|
taha.alam
|
5151997c7f
|
custom linear added with parameters to customize the properties of graph
|
1 month ago |
|
aamir-csol
|
e5f4da4e16
|
Merge branch 'master' into dev_aamir
# Conflicts:
# lib/presentation/medical_file/medical_file_page.dart
|
1 month ago |
|
Sikander Saleem
|
005157fe5e
|
Merge branch 'refs/heads/master' into dev_sikander
# Conflicts:
# lib/presentation/habib_wallet/recharge_wallet_page.dart
# lib/presentation/lab/lab_orders_page.dart
# lib/splashPage.dart
|
1 month ago |
|
aamir-csol
|
1125437a56
|
family screen & widgets
|
1 month ago |
|
Sikander Saleem
|
12cef74f16
|
splash animation added.
|
1 month ago |
|
Sultan khan
|
3d1d78ba48
|
Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
|
1 month ago |
|
Sultan khan
|
8f8c4c7f65
|
Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
# lib/presentation/medical_file/medical_file_page.dart
|
1 month ago |
|
haroon amjad
|
836a72ec22
|
App directionality changes
|
1 month ago |
|
haroon amjad
|
97038f1a25
|
advance payment implementation done for self & other file number
|
1 month ago |
|
haroon amjad
|
3e95999bf3
|
Merge branch 'master' into haroon_dev
|
1 month ago |
|
aamir-csol
|
f9bfc131a8
|
family screen & widgets
|
1 month ago |
|
Haroon Amjad
|
1c2564a1e2
|
updates
|
1 month ago |
|
haroon amjad
|
6048b3b5f1
|
Advance payment module implementation contd.
|
1 month ago |
|
aamir-csol
|
a79dcad221
|
family screen & widgets
|
1 month ago |
|
Sultan khan
|
4d52987c83
|
Merge branch 'dev_aamir' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
# lib/core/api_consts.dart
# lib/presentation/medical_file/medical_file_page.dart
|
1 month ago |
|
Sultan khan
|
5ce7548656
|
family file work-in-progress
|
1 month ago |
|
aamir-csol
|
8240d3e78d
|
Merge branch 'master' into dev_aamir
# Conflicts:
# lib/presentation/authentication/register_step2.dart
|
1 month ago |
|
Haroon Amjad
|
a4854bbe4a
|
Habib Wallet updates
|
1 month ago |
|
Haroon6138
|
25f0b9d415
|
Merge pull request 'haroon_dev' (#49) from haroon_dev into master
Reviewed-on: #49
|
1 month ago |
|
Haroon Amjad
|
bdde6c224d
|
Merge branch 'master' into haroon_dev
|
1 month ago |
|
Haroon6138
|
2c405aa0c3
|
Merge pull request 'ui improvement.' (#47) from dev_sikander into master
Reviewed-on: #47
|
1 month ago |
|
Haroon6138
|
5e82e02323
|
Merge pull request 'Location functionality' (#48) from functionality/location into master
Reviewed-on: #48
|
1 month ago |
|
Haroon Amjad
|
c9206f1ab8
|
Radiology report implemented
|
1 month ago |
|
haroon amjad
|
3b5d2d27a4
|
Updates
|
1 month ago |
|
Sultan khan
|
467f10e952
|
Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
|
1 month ago |
|
Sultan khan
|
0a653a61f2
|
family file bottomsheet added
|
1 month ago |
|
taha.alam
|
4473145c00
|
on success block added to the hms location block
|
1 month ago |
|
taha.alam
|
3fdd17ccaa
|
code added to get the location for gms hms and iphone. fallback added if the last known location is null.
|
1 month ago |
|
aamir-csol
|
17c47d093c
|
otp screen & register Uae & resend Activation Code.
|
1 month ago |
|
Sikander Saleem
|
2584e6cc6e
|
route animation improvement.
|
1 month ago |
|
Sikander Saleem
|
99e1036043
|
ui improvement.
|
1 month ago |
|
haroon amjad
|
4f4bef9d6f
|
Merge branch 'master' into haroon_dev
# Conflicts:
# lib/presentation/home/landing_page.dart
|
1 month ago |
|
haroon amjad
|
2961583414
|
update
|
1 month ago |
|
Sikander Saleem
|
bb0ac4a0fe
|
Merge branch 'refs/heads/master' into dev_sikander
|
1 month ago |
|
Sikander Saleem
|
c96081d07c
|
reverse animation time changed to 500ms.
|
1 month ago |
|
Sultan khan
|
030c2a1b8a
|
Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
|
1 month ago |
|
Sultan khan
|
eafb52ab86
|
family file work in-progress
|
1 month ago |
|
haroon amjad
|
928a056cbc
|
Merge branch 'master' into haroon_dev
|
1 month ago |
|
Haroon6138
|
bfdc9752ae
|
Merge pull request 'dev_aamir' (#45) from dev_aamir into master
Reviewed-on: #45
|
1 month ago |
|
haroon amjad
|
5e81ba1ed8
|
updates
|
1 month ago |
|
Haroon6138
|
05500e4cd1
|
Merge pull request 'drilled the lat and lng parameter form viewmodel to the mapper' (#44) from feature/search_by_region into master
Reviewed-on: #44
|
1 month ago |
|
Sikander Saleem
|
3267317457
|
Merge branch 'refs/heads/master' into dev_sikander
# Conflicts:
# lib/presentation/home/landing_page.dart
|
1 month ago |
|
Sikander Saleem
|
57827549b8
|
language switch added in drawer, and ui improvements
|
1 month ago |
|
aamir-csol
|
2b7656d83a
|
otp screen & register Uae & resend Activation Code.
|
1 month ago |
|
taha.alam
|
265d979b48
|
drilled the lat and lng parameter form viewmodel to the mapper
|
1 month ago |
|
aamir-csol
|
3ddd7781cd
|
Merge branch 'master' into dev_aamir
|
1 month ago |
|
haroon amjad
|
c191fd0be1
|
updates
|
1 month ago |
|
Sikander Saleem
|
f04f3bcd9c
|
Merge branch 'refs/heads/master' into dev_sikander
|
1 month ago |
|
Sikander Saleem
|
c00e69ef0c
|
profile wallet linked with view model.
|
1 month ago |
|
taha.alam
|
55c51f5742
|
Merge remote-tracking branch 'origin/master' into feature/search_by_region
|
1 month ago |
|
taha.alam
|
033ae12499
|
api handling for clinic and doctor parameters and state management
|
1 month ago |
|
aamir-csol
|
3b1b51ef6f
|
otp screen & register Uae & resend Activation Code.
|
1 month ago |
|
Sikander Saleem
|
c83754fc4a
|
user profile welcome widget improvement.
|
1 month ago |
|
Sultan khan
|
cd5da116f9
|
Merge branch 'dev_aamir' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
# lib/features/authentication/authentication_view_model.dart
# lib/features/authentication/widgets/otp_verification_screen.dart
|
1 month ago |
|
Sikander Saleem
|
8f0e910e4f
|
profile and settings ui completed.
|
1 month ago |
|
Sultan khan
|
fe36c2a1c1
|
auto sms
|
1 month ago |
|
aamir-csol
|
28a95959e0
|
Merge branch 'master' into dev_aamir
|
1 month ago |
|
aamir-csol
|
5de8314f3f
|
otp screen & register Uae & resend Activation Code.
|
1 month ago |
|
haroon amjad
|
3ab2546d10
|
merge fixes
|
1 month ago |
|
haroon amjad
|
05cf451181
|
Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New
# Conflicts:
# lib/features/my_appointments/my_appointments_view_model.dart
|
1 month ago |
|
haroon amjad
|
5de5fc8be9
|
updates
|
1 month ago |
|
Haroon6138
|
2ced674311
|
Merge pull request 'data from MyAppointmentViewmodel and MyAppointmentRepo migrated to bookappointment viewmodel and repo' (#40) from feature/search_by_region into master
Reviewed-on: #40
|
1 month ago |
|
taha.alam
|
de6e0e3704
|
data from MyAppointmentViewmodel and MyAppointmentRepo migrated to bookappointment viewmodel and repo
|
1 month ago |
|
aamir-csol
|
b9b0dfd1fa
|
Merge branch 'master' into dev_aamir
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/generated/locale_keys.g.dart
|
1 month ago |
|
aamir-csol
|
15c07cb4e2
|
otp screen & register Uae & resend Activation Code.
|
1 month ago |
|
haroon amjad
|
71a07eed8e
|
Merge branch 'master' into haroon_dev
|
1 month ago |
|
taha.alam
|
ea2d2bf40f
|
retaining the old data.
|
1 month ago |
|
taha.alam
|
788887a7f1
|
Merge remote-tracking branch 'origin/master' into feature/search_by_region
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/core/app_assets.dart
# lib/generated/locale_keys.g.dart
# lib/presentation/book_appointment/book_appointment_page.dart
# lib/presentation/home/navigation_screen.dart
|
1 month ago |
|
taha.alam
|
2174e0e292
|
viewmodel and repo updated for the appointment by region selection.
|
1 month ago |
|
taha.alam
|
9c2dd721b4
|
bottom sheets added of region facitlity and hospital.
|
1 month ago |
|
haroon amjad
|
f9e7c8988a
|
updates
|
2 months ago |
|
Sultan khan
|
6b766e558d
|
Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/core/app_assets.dart
# lib/generated/locale_keys.g.dart
# lib/presentation/home/landing_page.dart
# lib/presentation/home/navigation_screen.dart
|
2 months ago |
|
Sultan khan
|
286dfaa376
|
no message
|
2 months ago |
|
aamir-csol
|
fbd6ef0cf8
|
Merge branch 'master' into dev_aamir
# Conflicts:
# assets/langs/en-US.json
# lib/features/authentication/widgets/otp_verification_screen.dart
# lib/widgets/input_widget.dart
|
2 months ago |
|
aamir-csol
|
4e17ff9c82
|
otp screen & register Uae & resend Activation Code.
|
2 months ago |
|
haroon amjad
|
9f95150a94
|
book appointment implementation completed.
|
2 months ago |
|
Sultan khan
|
009fa1859e
|
Merge branch 'dev_aamir' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
|
2 months ago |
|
Sultan khan
|
fdd5d4cf6d
|
fixes
|
2 months ago |
|
aamir-csol
|
21a9cc8c89
|
otp screen & register Uae & resend Activation Code.
|
2 months ago |
|
Haroon Amjad
|
2aa84e0334
|
book appointment implementation contd.
|
2 months ago |
|
haroon amjad
|
6f745f3666
|
calendar implementation contd.
|
2 months ago |
|
aamir-csol
|
87830e17ab
|
otp screen
|
2 months ago |
|
haroon amjad
|
73f8baa77e
|
Merge branch 'master' into haroon_dev
# Conflicts:
# lib/core/dependencies.dart
# lib/extensions/string_extensions.dart
# lib/widgets/input_widget.dart
|
2 months ago |
|
Haroon6138
|
f15018b0e8
|
Merge pull request 'validations & otp widget & focus & auto fill' (#32) from dev_aamir into master
Reviewed-on: #32
|
2 months ago |
|
haroon amjad
|
7476c8e55a
|
book appo implementation contd.
|
2 months ago |
|
aamir-csol
|
6a09c2ec07
|
validations & otp widget & focus & auto fill
|
2 months ago |
|
Sikander Saleem
|
a25f42a43d
|
Merge branch 'refs/heads/master' into dev_sikander
# Conflicts:
# pubspec.yaml
|
2 months ago |
|
Sikander Saleem
|
e17d207ce5
|
swiper carousal view added in profile settings
|
2 months ago |
|
haroon amjad
|
3066bc8ea3
|
Book appointment implementation contd.
|
2 months ago |
|
Haroon Amjad
|
7b94199d58
|
Medical report implementation done, Book Appointment implementation contd.
|
2 months ago |
|
Haroon Amjad
|
14725616c6
|
medical report implementation contd.
|
2 months ago |
|
Haroon Amjad
|
de717edfe8
|
Sickleave implementation done.
|
2 months ago |
|
Haroon Amjad
|
b240293064
|
medical file implementation contd.
|
2 months ago |
|
haroon amjad
|
1c39b26fcc
|
Merge branch 'master' into haroon_dev
|
2 months ago |
|
haroon amjad
|
151351c0bf
|
medical file updates
|
2 months ago |
|
aamir-csol
|
7c8d7b67a9
|
signup finalize
|
2 months ago |
|
aamir-csol
|
b7e19a0af8
|
Merge branch 'master' into dev_aamir
# Conflicts:
# lib/features/authentication/authentication_view_model.dart
|
2 months ago |
|
aamir-csol
|
0c58c22ea5
|
sign
|
2 months ago |
|
Haroon Amjad
|
5620cc4442
|
medical file implementation contd.
|
2 months ago |
|
haroon amjad
|
d87562caf5
|
updates
|
2 months ago |
|
haroon amjad
|
3a649bca35
|
Merge branch 'master' into haroon_dev
|
2 months ago |
|
aamir-csol
|
6f011880bd
|
Merge branch 'master' into dev_aamir
# Conflicts:
# lib/core/api_consts.dart
# lib/features/authentication/authentication_view_model.dart
|
2 months ago |
|
haroon amjad
|
9fbb8c3418
|
updates
|
2 months ago |
|
aamir-csol
|
70810fa14c
|
signup completed
|
2 months ago |
|
aamir-csol
|
2b18e08e64
|
signup completed
|
2 months ago |
|
aamir-csol
|
8c55064158
|
signup completed
|
2 months ago |
|
haroon amjad
|
41ca0e27d9
|
updates
|
2 months ago |
|
haroon amjad
|
1de551e799
|
Merge branch 'master' into haroon_dev
# Conflicts:
# lib/core/app_assets.dart
# lib/features/authentication/authentication_view_model.dart
|
2 months ago |
|
haroon amjad
|
28da6e0a2c
|
updates
|
2 months ago |