haroon amjad
df8ab0dab5
Merge branch 'master' into haroon_dev
2 months ago
haroon amjad
9e9344cd0f
updates
2 months ago
aamir-csol
877a7f083e
Merge branch 'master' into dev_aamir
2 months ago
aamir-csol
79b0c695c2
Translation
2 months ago
haroon amjad
782cd01b4b
updates
2 months ago
haroon amjad
bd89a840a0
updates
2 months ago
Sultan khan
bd09bd04de
no message
2 months ago
aamir-csol
6a180d10de
Merge branch 'master' into dev_aamir
...
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
2 months ago
aamir-csol
697642143c
Translation & Calender
2 months ago
Sultan khan
246d414fe1
updates and fixes
2 months ago
Sultan khan
d9b6e9fed8
fixes and updates
2 months ago
haroon amjad
333f702f80
updates & fixes
2 months ago
haroon amjad
04db991851
updates
2 months ago
aamir-csol
43e3c05ba1
Merge branch 'master' into dev_aamir
2 months ago
aamir-csol
ff55257e73
Zoom in and Out
2 months ago
Sultan khan
ab7ca36d5d
Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
...
# Conflicts:
# assets/langs/en-US.json
2 months ago
aamir-csol
fdf21b725e
Zoom in and Out
2 months ago
Sultan khan
5629012825
live care chat url changed
2 months ago
Sultan khan
25cc485830
landing navigation item changed from feed back to health calculator and triage page provided
2 months ago
aamir-csol
458819398d
Localization & rad error fix
2 months ago
aamir-csol
2d61535a59
Localization & rad error fix
2 months ago
aamir-csol
42f4333a28
Merge branch 'master' into dev_aamir
2 months ago
khansultan1
ff336e1b0e
Merge pull request 'dev_sultan' ( #272 ) from dev_sultan into master
...
Reviewed-on: #272
2 months ago
aamir-csol
e5a055d355
Localization & rad error fix
2 months ago
haroon amjad
fe82f12b33
fix for patient share
2 months ago
Sultan khan
56d593430d
no message
2 months ago
khansultan1
78cf05c0e5
Merge pull request 'Emergency servicews pages changes of passing the values which are displayed outside' ( #270 ) from changes into master
...
Reviewed-on: #270
2 months ago
tahaalam
b93e23a314
Emergency servicews pages changes of passing the values which are displayed outside
2 months ago
Sultan khan
54a6a5cd90
Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
2 months ago
khansultan1
3393874d78
Merge pull request 'social media icons added' ( #268 ) from changes into master
...
Reviewed-on: #268
2 months ago
Sultan khan
1ef7ed6344
no message
2 months ago
aamir-csol
13040a17a7
Merge branch 'master' into dev_aamir
...
# Conflicts:
# lib/features/authentication/authentication_view_model.dart
2 months ago
tahaalam
fb64d3b957
Merge remote-tracking branch 'origin/master' into changes
...
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/features/authentication/authentication_view_model.dart
# lib/generated/locale_keys.g.dart
2 months ago
tahaalam
e73d2534cc
social media elements added for profile and service page
2 months ago
aamir-csol
1c929999f1
Localization
2 months ago
Sultan khan
83a414796a
Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
...
# Conflicts:
# lib/features/authentication/authentication_view_model.dart
2 months ago
Sultan khan
1366518ce1
fixes and updates
2 months ago
faizatflutter
10db964fd8
Merge branch 'master' into faiz_dev
...
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/generated/locale_keys.g.dart
2 months ago
faizatflutter
61f17a3feb
fixed api localization issue
2 months ago
Sultan khan
b18ddd1ad7
Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
...
# Conflicts:
# lib/generated/locale_keys.g.dart
2 months ago
Sultan khan
8a41b5716f
updates
2 months ago
tahaalam
05aaa71cf9
live care changes
2 months ago
faizatflutter
8c925a7f5e
Merge branch 'master' into faiz_dev
...
# Conflicts:
# ios/Podfile.lock
2 months ago
tahaalam
513422cb03
Merge remote-tracking branch 'origin/master' into changes
2 months ago
tahaalam
bf7b0d922e
weather permission issue
2 months ago
aamir-csol
cb2e3c7574
Merge branch 'master' into dev_aamir
...
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/generated/locale_keys.g.dart
# lib/presentation/book_appointment/select_clinic_page.dart
2 months ago
Sultan khan
6c3808effe
Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
...
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/generated/locale_keys.g.dart
# lib/presentation/blood_donation/widgets/select_gender_widget.dart
# lib/presentation/comprehensive_checkup/comprehensive_checkup_page.dart
2 months ago
aamir-csol
baa9ebe7ea
Merge branch 'master' into dev_aamir
...
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
2 months ago
Sultan khan
256537cfb3
update and fix
2 months ago
aamir-csol
1849a90b32
Localization
2 months ago
tahaalam
cfcbaa85a3
LANGUAGE CHANGES
2 months ago
tahaalam
ee8257054e
Merge remote-tracking branch 'origin/master' into changes
...
# Conflicts:
# assets/langs/en-US.json
2 months ago
tahaalam
6b4d43caf3
referral hardcoded string changes
2 months ago
tahaalam
28d03644ba
Merge remote-tracking branch 'origin/master' into changes
...
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/generated/locale_keys.g.dart
2 months ago
Sultan khan
fee2001499
Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
...
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
2 months ago
Sultan khan
929a25d9a4
no message
2 months ago
tahaalam
138e65d6fc
Merge remote-tracking branch 'origin/master' into changes
2 months ago
aamir-csol
60b71e9b1d
Merge branch 'master' into dev_aamir
2 months ago
aamir-csol
1515fc57e5
Localization
2 months ago
tahaalam
bf9b88e79c
map prescriptiojn changes
...
date sorting for the rrt and amublance history.
weather issue,
e refferal langauge
2 months ago
Sultan khan
94993fa6fb
fixes and updates
2 months ago
tahaalam
66e23197c5
referral lingual change
2 months ago
Sultan khan
42e710c61f
Rad Description & Ai Description
2 months ago
Sultan khan
bd581c4fe0
Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
...
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/generated/locale_keys.g.dart
2 months ago
Sultan khan
82f2adfc3f
Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
2 months ago
Sultan khan
c1c434789e
Rad Description & Ai Description
2 months ago
tahaalam
a31c4c99df
Merge remote-tracking branch 'origin/master' into changes
...
# Conflicts:
# assets/langs/ar-SA.json
# lib/generated/codegen_loader.g.dart
# lib/generated/locale_kesy.g.dart
2 months ago
tahaalam
2d36d91ab6
language and stepper changes
2 months ago
Sultan khan
c2dcf95d52
update and fix
2 months ago
aamir-csol
01e56e4fb5
Merge branch 'refs/heads/master' into dev_aamir
2 months ago
aamir-csol
db2ccd3be6
Date & Time New Widget For Whole App
2 months ago
tahaalam
50a597b4d3
lang changes
2 months ago
Sultan khan
6bc80a394d
Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
2 months ago
khansultan1
f14958f9e1
Merge pull request 'reminder changes' ( #248 ) from changes into master
...
Reviewed-on: #248
2 months ago
tahaalam
14771b32d3
reminder changes
2 months ago
Sultan khan
c2d468bd74
Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
2 months ago
khansultan1
5c3b1fe448
Merge pull request 'localization changes' ( #247 ) from changes into master
...
Reviewed-on: #247
2 months ago
tahaalam
5a4e5e138b
string localization changes
2 months ago
Sultan khan
898cbb0a78
Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
2 months ago
khansultan1
8e9c5ae6df
Merge pull request 'radiology ai Analysis' ( #246 ) from dev_aamir into master
...
Reviewed-on: #246
2 months ago
Sultan khan
9ff303d514
fixes and updates.
2 months ago
tahaalam
aa22ad1e07
calender request changes
2 months ago
aamir-csol
4cd5132627
radiology ai Analysis
2 months ago
Sultan khan
0a24e6cfd1
Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
2 months ago
Sultan khan
fd3e434b0c
no message
2 months ago
aamir-csol
7d86ca0511
Merge branch 'master' into dev_aamir
2 months ago
aamir-csol
4c56137f10
calender
2 months ago
tahaalam
c19451a6b6
profile picture fix
2 months ago
Sultan khan
9e5c9f9b4c
no message
2 months ago
Sultan khan
a38a2a0619
Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
...
# Conflicts:
# assets/langs/ar-SA.json
# lib/generated/codegen_loader.g.dart
2 months ago
khansultan1
75bd5fbe15
Merge pull request 'updates and fixes' ( #240 ) from changes into master
...
Reviewed-on: #240
2 months ago
Sultan khan
69310575e5
updates
2 months ago
tahaalam
994bf95043
updates and fixes
2 months ago
haroon amjad
4f60227429
LiveCare Video Call fixes
2 months ago
Sultan khan
772f6caa38
updates
2 months ago
tahaalam
befcee7c65
Merge remote-tracking branch 'origin/master' into changes
...
# Conflicts:
# assets/langs/ar-SA.json
2 months ago
Sultan khan
a2c2b24b2a
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 calculator design & timer & bell icon switch changes
health calculator design & timer & bell icon switch changes
appointment reminder & weather
codegen
2 months ago
Sultan khan
76c3013840
no message
2 months ago
Sultan khan
2f4db29a70
arabic updated.
2 months ago
aamir-csol
f0b8db0318
Merge branch 'master' into dev_aamir
...
# Conflicts:
# lib/features/medical_file/medical_file_view_model.dart
# lib/presentation/appointments/appointment_details_page.dart
2 months ago
aamir-csol
f199fca859
health calculator design & timer & bell icon switch changes
2 months ago
aamir-csol
461fa11df3
health calculator design & timer & bell icon switch changes
2 months ago
tahaalam
04d14a4d82
langauge regarding changes
2 months ago
Sultan khan
16e898bb6c
updates and fixes
2 months ago
aamir-csol
90bcdf674d
Merge branch 'refs/heads/master' into dev_aamir
...
# Conflicts:
# android/app/src/main/AndroidManifest.xml
2 months ago
tahaalam
303fb87661
Merge remote-tracking branch 'origin/master' into changes
2 months ago
tahaalam
fcf990bc00
hot fixes
2 months ago
Sultan khan
cfea843c4f
updates and fixes
2 months ago
aamir-csol
2b0f8b45b0
appointment reminder & weather
2 months ago
faizatflutter
8c3121fd38
Merge branch 'master' into faiz_dev
...
# Conflicts:
# ios/Podfile.lock
2 months ago
Sultan khan
a144f30f42
no message
2 months ago
tahaalam
d97ead4e03
Merge remote-tracking branch 'origin/master' into changes
...
# Conflicts:
# lib/core/app_assets.dart
2 months ago
tahaalam
fb93aa1092
ambulance call page changes:
...
1. icon change for the success of ambulance call and rrt.
2. flow changed to first select the appoiintment then hospital.
3. location accorate enabled.
2 months ago
tahaalam
ebfefefec0
issue fix for the projects having distance not found if the permission for the application
2 months ago
haroon amjad
be8cf08005
Merge branch 'master' into haroon_dev
2 months ago
haroon amjad
509eeb69ac
fixes
2 months ago
haroon amjad
be08c3f228
updates
2 months ago
Sultan khan
bd5ef5e84a
no message
2 months ago
Sultan khan
beab4c1d08
no message
2 months ago
Sultan khan
8e8177e573
fixes and updates
2 months ago
Sultan khan
3d226c39d0
fixes and updates
2 months ago
Sultan khan
207b84e493
fixes and updates
2 months ago
Sultan khan
7e2c470767
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 & fixes
2 months ago
Sultan khan
5f82f0db2d
fixes and updates
2 months ago
haroon amjad
86fa198afc
Updates & fixes
2 months ago
haroon amjad
408c0c83d9
updates
2 months ago
haroon amjad
a55bfb3b51
Merge branch 'master' into haroon_dev
2 months ago
aamir-csol
b4ab3a112c
Merge branch 'master' into dev_aamir
...
# Conflicts:
# lib/presentation/my_family/widget/family_cards.dart
2 months ago
haroon amjad
b82f4cbcb4
Merge branch 'master' into haroon_dev
2 months ago
haroon amjad
e60d2566d9
Updates
2 months ago
aamir-csol
13ce350434
family file
2 months ago
Sultan khan
1aacda08a3
no message
2 months ago
Sultan khan
5989dda613
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 :
QLine API changes handled
2 months ago
Sultan khan
21c7b05df9
no message
2 months ago
Sultan khan
fcdc96d944
no message
2 months ago
haroon amjad
0566685e48
QLine API changes handled
2 months ago
Sultan khan
21ae30a8cc
profile picture upload
2 months ago
Sultan khan
5f559a44dd
profile image upload
2 months ago
haroon amjad
6a687f4ff6
Updates & fixes
2 months ago
haroon amjad
f472bd49f4
Updates
2 months ago
haroon amjad
a0d9c35d0a
Merge branch 'master' into haroon_dev
2 months ago
haroon amjad
5b44329972
updates
2 months ago
aamir-csol
39cbee029a
radiology ai lab analysis & lab ai analysis api end points updates.
2 months ago
aamir-csol
74479850f5
radiology ai lab analysis & lab ai analysis api end points updates.
2 months ago
aamir-csol
7a0caa05c3
Merge branch 'master' into dev_aamir
2 months ago
aamir-csol
d1e0ec31e6
radiology ai lab analysis & lab ai analysis api end points updates.
2 months ago
haroon amjad
ad0cbe1e21
updates
2 months ago
haroon amjad
b33a559305
Dental workflow implemented
2 months ago
haroon amjad
d899d21fa3
Merge branch 'master' into haroon_dev
2 months ago
haroon amjad
f8df84177d
update
2 months ago
haroon amjad
bb274e80c1
updates
2 months ago
Sultan khan
3d1c415e2c
my invoice updated
2 months ago
haroon amjad
fbb758e227
Merge branch 'master' into haroon_dev
2 months ago
Sultan khan
6d647d75be
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
radiology ai lab analysis & lab ai analysis api end points updates.
Updates
updates
updates
# Conflicts:
# lib/presentation/symptoms_checker/widgets/selected_organs_section.dart
2 months ago
haroon amjad
5a402b45b7
color update
2 months ago
Sultan khan
a5f7bd80b2
updates
2 months ago
haroon amjad
708cbb138d
Updates
...
# Conflicts:
# lib/presentation/radiology/radiology_result_page.dart
2 months ago
Haroon6138
126423d6a1
Merge branch 'master' into haroon_dev
2 months ago
aamir-csol
2d7aa5d80d
radiology ai lab analysis & lab ai analysis api end points updates.
2 months ago
Sultan khan
acff5d220c
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 :
radiology ai lab analysis & lab ai analysis api end points updates.
2 months ago
haroon amjad
a2de3f1b14
Merge branch 'master' into haroon_dev
...
# Conflicts:
# lib/presentation/symptoms_checker/widgets/selected_organs_section.dart
2 months ago
Sultan khan
cc9ac07923
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 :
family switch parent child and child 2 ,
2 months ago
Sultan khan
712e835176
ui fixes
2 months ago
haroon amjad
fe1e0fdb40
Updates
2 months ago
aamir-csol
10fa8c46cf
radiology ai lab analysis & lab ai analysis api end points updates.
2 months ago
haroon amjad
572c37785b
updates
2 months ago
haroon amjad
6939630ce0
Merge branch 'master' into haroon_dev
2 months ago
haroon amjad
5318437941
updates
2 months ago
Sultan khan
18331f077e
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 : (41 commits)
pull down to refresh in appointment queue implemented
Pull to refresh implemented
Updates & fixes
updates
Updates
Updates
WD:map issues resolved: 1. map type added to the screen along with the translation 2. null shown for the arabic name of the fixed to show the actual name. 3. if the user opens the locationBottomsheet and close it without input of the area the screen freezes with no action on the location. 4. Gms And Hms Maps handled. 5. theme handled inside the maps screen.
Updates
Font changes, Updates & fixes
map type is added to the maps already present
family switch parent child and child 2
translation service changes
Updates
updates
print statement removed
graph reference low nd high value address. * if the referenncehigh is 0 then it will be neglected * if the referencelow is 0 then it will be neglected.
family switch parent child and child 2
updates
remote localization files added
Updates
...
# Conflicts:
# android/app/build.gradle.kts
# lib/presentation/rate_appointment/rate_appointment_doctor.dart
2 months ago
Sultan khan
287dcf3482
updates
2 months ago
aamir-csol
7fcee6a988
family switch parent child and child 2 ,
2 months ago
haroon amjad
185f505ed9
pull down to refresh in appointment queue implemented
2 months ago
haroon amjad
991f9c7a9b
Pull to refresh implemented
2 months ago
haroon amjad
71030c0fe9
Updates & fixes
2 months ago
haroon amjad
13a4c9e0f8
updates
2 months ago
haroon amjad
e3f5bb69ac
Updates
2 months ago
haroon amjad
081dfce480
Merge branch 'master' into haroon_dev
...
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/extensions/string_extensions.dart
# lib/generated/locale_keys.g.dart
# lib/presentation/emergency_services/call_ambulance/call_ambulance_page.dart
# lib/presentation/emergency_services/widgets/location_input_bottom_sheet.dart
# lib/widgets/input_widget.dart
2 months ago
haroon amjad
a9f46a39cc
Updates
2 months ago
haroon amjad
92101d2b05
Merge branch 'master' into haroon_dev
...
# Conflicts:
# lib/presentation/my_family/widget/family_cards.dart
2 months ago
Sultan khan
b3fa4c9bdf
Merge remote-tracking branch 'origin/master' into maptype
2 months ago
Sultan khan
0d4563542a
WD:map issues resolved:
...
1. map type added to the screen along with the translation
2. null shown for the arabic name of the fixed to show the actual name.
3. if the user opens the locationBottomsheet and close it without input of the area the screen freezes with no action on the location.
4. Gms And Hms Maps handled.
5. theme handled inside the maps screen.
2 months ago
haroon amjad
89a1da4407
Updates
2 months ago
faizatflutter
d8ab3c047f
fixed arabic api issue
2 months ago
haroon amjad
56f5151c0c
Font changes, Updates & fixes
2 months ago
tahaalam
c716490b0e
map type is added to the maps already present
2 months ago
aamir-csol
351026e42c
Merge branch 'master' into dev_aamir
2 months ago
aamir-csol
be6d33e51b
family switch parent child and child 2
2 months ago
haroon amjad
fed6cf6784
translation service changes
2 months ago
haroon amjad
453cfc07e1
Updates
2 months ago
haroon amjad
9c51f53a4d
Merge branch 'master' into haroon_dev
2 months ago
haroon amjad
1fa03fff5e
updates
2 months ago
tahaalam
07bf971575
print statement removed
2 months ago
tahaalam
2ae9ab9fac
graph reference low nd high value address.
...
* if the referenncehigh is 0 then it will be neglected
* if the referencelow is 0 then it will be neglected.
2 months ago
aamir-csol
e9ec23f506
family switch parent child and child 2
2 months ago
haroon amjad
21477f34dc
updates
2 months ago
haroon amjad
0eb9ec11d3
remote localization files added
2 months ago
haroon amjad
f929bd9017
Updates
2 months ago
haroon amjad
400e5daac0
Dr Search fixed
2 months ago
aamir-csol
aa17688de6
Merge branch 'master' into dev_aamir
2 months ago
haroon amjad
3d39190c62
updates & fixes
2 months ago