Aamir Muhammad
8787713d84
Merge branch 'refs/heads/master' into dev_aamir
3 weeks ago
Aamir Muhammad
008878676a
Accessibility & Image Widgets Update
3 weeks ago
Haroon6138
49b8a51480
Merge pull request 'Accessibility Changes' ( #329 ) from dev_aamir into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/329
3 weeks ago
Aamir Muhammad
c5b77e595d
Merge branch 'refs/heads/master' into dev_aamir
3 weeks ago
Aamir Muhammad
14c5977013
Accessibility & Image Widgets Update
3 weeks ago
Haroon6138
821bc578c9
Merge pull request 'Accessibility & Image Widgets Update' ( #328 ) from dev_aamir into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/328
3 weeks ago
Aamir Muhammad
8a94f5b476
Accessibility & Image Widgets Update
3 weeks ago
Haroon6138
cdc6cf1fec
Merge pull request 'HMG x Infermedica (faiz_dev_symptoms_checker)' ( #327 ) from faiz_dev_symptoms_checker into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/327
3 weeks ago
faizatflutter
1587dddda4
completed the symmtoms checker suggestions from infermedica
3 weeks ago
faizatflutter
ce23c0302a
completed the symmtoms checker suggestions from infermedica
3 weeks ago
faizatflutter
02e44ed7fb
added 3 apis
3 weeks ago
faizatflutter
c8378278c9
Merge branch 'master' into faiz_dev_symptoms_checker
...
# Conflicts:
# assets/langs/ar-SA.json
# lib/generated/locale_keys.g.dart
3 weeks ago
Haroon6138
e7758a8142
Merge pull request 'dev_aamir' ( #326 ) from dev_aamir into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/326
3 weeks ago
faizatflutter
826d12e57d
symptoms checker suggestions from infermedia inprogress
3 weeks ago
Aamir Muhammad
6eaef4250b
Merge branch 'refs/heads/master' into dev_aamir
4 weeks ago
Aamir Muhammad
3dac6cb3a7
Last Login UAE Fix
4 weeks ago
Haroon6138
4a4a4a05fe
Merge pull request 'Hamza Fix For Arabic Search' ( #325 ) from dev_aamir into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/325
4 weeks ago
Aamir Muhammad
31035ed0cc
Hamza Fix For Arabic Search
4 weeks ago
Haroon6138
7b27c7400b
Merge pull request 'haroon_dev' ( #324 ) from haroon_dev into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/324
4 weeks ago
haroon amjad
6249daa67d
parking QR disabled & other fixes
4 weeks ago
haroon amjad
bcdbfa99ed
Fixes & update to stores VersionID 21.3
4 weeks ago
Haroon Amjad
3590dfc511
Wallet amount reload
4 weeks ago
haroon amjad
89670445b3
updates
4 weeks ago
haroon amjad
e427e91b2f
Merge branch 'master' into haroon_dev
...
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/core/api_consts.dart
# lib/generated/locale_keys.g.dart
# lib/presentation/symptoms_checker/triage_screen.dart
1 month ago
Haroon6138
4ee69bd391
Merge pull request 'Added invoicehistory in wallet page and added isFastTrack param in Submit Refund (faiz_dev)' ( #323 ) from faiz_dev into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/323
1 month ago
haroon amjad
98450b4f94
Appointment parking QR implemented
1 month ago
faizatflutter
b77b4db2c8
Merge branch 'master' into faiz_dev
1 month ago
faizatflutter
6b4ad35217
fixed er 'pickFiles' can't be acc
1 month ago
haroon amjad
f08775cbd4
Updates & fixes
1 month ago
haroon amjad
8ffd7485d6
updates
1 month ago
haroon amjad
09cfbea7b4
Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New
...
# Conflicts:
# ios/Runner.xcodeproj/project.pbxproj
1 month ago
haroon amjad
748780e3a9
ios updates
1 month ago
haroon amjad
50f78942ed
updates
1 month ago
Haroon6138
df07f386ac
Merge pull request 'Completed Refund Request Module for Invoice and Withdraw from Wallet' ( #322 ) from faiz_dev into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/322
1 month ago
faizatflutter
05730d3774
fixed er 'pickFiles' can't be acc
1 month ago
faizatflutter
6efbe257d1
Merge branch 'master' into faiz_dev
...
# Conflicts:
# lib/core/dependencies.dart
# lib/main.dart
# lib/presentation/authentication/register_step2.dart
1 month ago
faizatflutter
897bd30879
Refund Module Completed
1 month ago
Haroon6138
a173dd3389
Merge pull request 'offers_discounts' ( #321 ) from offers_discounts into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/321
1 month ago
Aamir Muhammad
ffe2c3e568
Merge branch 'refs/heads/master' into offers_discounts
1 month ago
Aamir Muhammad
217b423308
OTP Changes & Drop Down Fixes.
1 month ago
haroon amjad
171a6a2d74
fixes
1 month ago
haroon amjad
68248f0cf0
updates
1 month ago
haroon amjad
ab86d53261
Updates
1 month ago
haroon amjad
502fc82c28
updates
1 month ago
haroon amjad
f03939b9d0
Merge branch 'master' into haroon_dev
1 month ago
Haroon6138
778d560bfc
Merge pull request 'offers_discounts' ( #320 ) from offers_discounts into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/320
1 month ago
Aamir Muhammad
6698b89c9a
Merge branch 'refs/heads/master' into offers_discounts
1 month ago
Aamir Muhammad
8365d2c4ee
Image Functionality & Discounts & Offers
1 month ago
haroon amjad
49d3e53eb3
Merge branch 'master' into haroon_dev
1 month ago
haroon amjad
82dad582c4
Updates
1 month ago
Haroon6138
0c1fc102f0
Merge pull request 'offers_discounts' ( #319 ) from offers_discounts into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/319
1 month ago
Aamir Muhammad
1ff91bb159
Image Functionality & Discounts & Offers
1 month ago
Aamir Muhammad
c77ee66c3a
Image Functionality & Discounts & Offers
1 month ago
Aamir Muhammad
4fd2312e61
Merge branch 'refs/heads/master' into offers_discounts
...
# Conflicts:
# lib/presentation/my_family/widget/family_cards.dart
1 month ago
Haroon6138
92795dc8e1
Merge pull request 'haroon_dev' ( #318 ) from haroon_dev into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/318
1 month ago
Aamir Muhammad
4a384efd2d
Image Functionality & Discounts & Offers
1 month ago
Aamir Muhammad
2b53cce0aa
Merge branch 'refs/heads/master' into offers_discounts
...
# Conflicts:
# lib/core/api_consts.dart
# lib/presentation/home/landing_page.dart
# lib/presentation/my_family/widget/family_cards.dart
1 month ago
Aamir Muhammad
7cd1d84ff6
Image Functionality & Discounts & Offers
1 month ago
haroon amjad
227dd407f5
Updates
1 month ago
haroon amjad
91876f2b6b
profile image added in review appointments page
1 month ago
faizatflutter
64da8f1804
Merge branch 'master' into faiz_dev
...
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/core/dependencies.dart
# lib/features/habib_wallet/habib_wallet_view_model.dart
# lib/generated/locale_keys.g.dart
# lib/main.dart
# lib/presentation/home/landing_page.dart
# lib/presentation/medical_file/medical_file_page.dart
1 month ago
faizatflutter
67bb3895e2
Refund Module almost done
1 month ago
Haroon Amjad
ee17330279
event based app theming planning
1 month ago
Haroon Amjad
b49e1a222b
Added sharedpref on no thanks option in symptom checker bottom sheet
1 month ago
Haroon6138
c29632ffc0
Merge pull request 'haroon_dev' ( #317 ) from haroon_dev into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/317
2 months ago
haroon amjad
52d8ad711d
PenguinIn Android SDK updated to support 16 kb page alignment
2 months ago
haroon amjad
4015f5ba2e
PayTabs Card & Apple Pay Payment integration completed.
2 months ago
faizatflutter
198280fbde
Refund Request and Withdraw Module In Progress!
2 months ago
Haroon6138
9311477ce3
Merge pull request 'organs added for the medication input' ( #316 ) from symtomcheckers into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/316
2 months ago
haroon amjad
155916b1a8
Paytabs implementation contd.
2 months ago
tahaalam
87b6e055da
organs added for the medication input
2 months ago
Haroon Amjad
cdc82c83f8
Paytabs implemented in Wallet payment
2 months ago
haroon amjad
0db762fa2c
Paytabs implementation contd.
2 months ago
haroon amjad
73066ba21a
Update & fixes, App update to stores VersionID 21.2
2 months ago
haroon amjad
92213b03e4
Merge branch 'haroon_dev' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into haroon_dev
2 months ago
haroon amjad
2877bb3995
updates
2 months ago
Haroon Amjad
71562f6441
updates
2 months ago
Haroon Amjad
9ead2cacaf
updates & fixes
2 months ago
haroon amjad
4329aa05ad
update to stores, VersionID 21.2
2 months ago
faizatflutter
8aa152f1a0
added apis
2 months ago
haroon amjad
f7d415b7eb
LocationID updates
2 months ago
haroon amjad
a9d085098f
Pharmacy invoice implemented
2 months ago
faizatflutter
7cf593443d
Refund Request Started
2 months ago
Haroon6138
494481f5c5
Merge pull request 'haroon_dev' ( #315 ) from haroon_dev into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/315
2 months ago
haroon amjad
469479d7cb
updates
2 months ago
haroon amjad
9986729ba5
Updates & fixes
2 months ago
haroon amjad
c9e602cfa3
updates & fixes
2 months ago
haroon amjad
9d04133b8d
Lakum integration completed
2 months ago
haroon amjad
40a0ecdda4
Lakum integration contd.
2 months ago
haroon amjad
285287e596
crashlytics fixes
2 months ago
Haroon6138
99dfd2cea9
Merge pull request 'Dob & Gender Fix' ( #314 ) from dev_aamir into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/314
2 months ago
Haroon6138
8f76503bd7
Merge pull request 'dev_sultan' ( #313 ) from dev_sultan into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/313
2 months ago
Aamir CSol
8b9ba23d72
Merge branch 'refs/heads/master' into dev_aamir
2 months ago
Aamir CSol
3f683917cb
Dob Fix, Gender Fix
2 months ago
Sultan khan
b6e3c4a5ce
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 :
Hotfix app update sent to stores, VersionID 21.1, Lakum points implementation contd.
updates
Er refferal Fix
last login issue resolved
Updates
updates
updates & fixes
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/generated/locale_keys.g.dart
# lib/presentation/e_referral/new_e_referral.dart
# lib/presentation/e_referral/widget/e_referral_other_details.dart
2 months ago
Sultan khan
696eeccdbd
no message
2 months ago
Sultan khan
e05c0dd091
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
updates
updates
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
2 months ago
Haroon6138
9a54d51045
Merge pull request 'haroon_dev' ( #311 ) from haroon_dev into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/311
2 months ago
haroon amjad
b6c9fb96d4
Hotfix app update sent to stores, VersionID 21.1, Lakum points implementation contd.
2 months ago
haroon amjad
67bcd34344
Merge branch 'master' into haroon_dev
2 months ago
Haroon6138
36e86d1852
Merge pull request 'Er refferal Fix' ( #310 ) from dev_aamir into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/310
2 months ago
haroon amjad
7c49606331
updates
2 months ago
Aamir CSol
8ddd27fe8c
Er refferal Fix
2 months ago
haroon amjad
a623a418d5
Merge branch 'master' into haroon_dev
2 months ago
haroon amjad
8e13dd72c8
last login issue resolved
2 months ago
haroon amjad
3bb58e2e64
Updates
2 months ago
Haroon6138
7e06d8e653
Merge pull request 'haroon_dev' ( #309 ) from haroon_dev into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/309
2 months ago
haroon amjad
4b3c986dc2
updates
2 months ago
haroon amjad
3759a0c7c8
Merge branch 'master' into haroon_dev
2 months ago
haroon amjad
7ef435690d
updates & fixes
2 months ago
Haroon6138
fa3a4029cc
Merge pull request 'haroon_dev' ( #308 ) from haroon_dev into master
...
Reviewed-on: #308
2 months ago
Sultan khan
8e1625d116
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 :
Input Field Error Handling
Input Field Error Handling
2 months ago
Sultan khan
d86a9b5ed9
no message
2 months ago
haroon amjad
13cab04791
updates
2 months ago
haroon amjad
695d6566a1
updates
2 months ago
Haroon6138
324d9d4883
Merge pull request 'Input Fields Error Handling' ( #307 ) from dev_aamir into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/307
2 months ago
Aamir CSol
91f2cc2ee0
Input Field Error Handling
2 months ago
Aamir CSol
c93aa5993e
Merge branch 'master' into dev_aamir
2 months ago
Aamir CSol
1911f7ce64
Input Field Error Handling
2 months ago
haroon amjad
021a835fa8
updates
2 months ago
haroon amjad
6532002cdd
updates
2 months ago
Haroon6138
f08c2f0b0c
Merge pull request 'dev_sultan' ( #306 ) from dev_sultan into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/306
2 months ago
Sultan khan
d9d7a8b7c2
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 :
updated scheduleApi Fix
Completed the SymptomsChecker Changes
Updates & http client enhancements
Updates
updates
Symptoms checker flow updates and Design Fixes on Fold
Habib Wallet fix in services page
Design fixes on Fold
Updates & fixes
Design changes on fold
updates
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
2 months ago
Sultan khan
e2adc629b8
e-referral issue and registration crashlytics issue fixed.
2 months ago
Haroon6138
f6e38c40f5
Merge pull request 'Updated scheduleAppointment API Fix (faiz_dev)' ( #305 ) from faiz_dev into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/305
2 months ago
faizatflutter
0e92f9ea34
Merge branch 'master' into faiz_dev
2 months ago
faizatflutter
b03cbf518c
updated scheduleApi Fix
2 months ago
Haroon6138
b71a73c49a
Merge pull request 'Completed the SymptomsChecker Changes (faiz_dev)' ( #304 ) from faiz_dev into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/304
2 months ago
faizatflutter
f3f47dfa4f
Merge branch 'master' into faiz_dev
2 months ago
faizatflutter
03ce3b617d
Completed the SymptomsChecker Changes
2 months ago
Haroon6138
9638dc924a
Merge pull request 'haroon_dev' ( #303 ) from haroon_dev into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/303
2 months ago
haroon amjad
c9406aa66d
Updates & http client enhancements
2 months ago
haroon amjad
34cc16c24f
Updates
2 months ago
haroon amjad
9458e205af
Merge branch 'master' into haroon_dev
...
# Conflicts:
# lib/presentation/appointments/widgets/appointment_card.dart
# lib/presentation/hmg_services/services_page.dart
# lib/presentation/home/landing_page.dart
2 months ago
haroon amjad
da904d8183
updates
2 months ago
Haroon6138
da68a384aa
Merge pull request 'Symptoms checker flow updates and Design Fixes on Fold (faiz_dev)' ( #301 ) from faiz_dev into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/301
2 months ago
faizatflutter
a9d7190348
Merge branch 'master' into faiz_dev
...
# Conflicts:
# lib/core/api_consts.dart
# lib/presentation/home/landing_page.dart
# lib/presentation/medical_file/medical_file_page.dart
2 months ago
faizatflutter
63fd82407e
Symptoms checker flow updates and Design Fixes on Fold
2 months ago
haroon amjad
121e5bd031
Habib Wallet fix in services page
2 months ago
faizatflutter
7b1684c455
Design fixes on Fold
2 months ago
haroon amjad
0e2b8db63a
Updates & fixes
2 months ago
haroon amjad
93cbb563bc
Merge branch 'master' into haroon_dev
2 months ago
Haroon6138
f47809777d
Merge pull request 'dev_sultan' ( #300 ) from dev_sultan into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/300
2 months ago
Sultan khan
8d1a54f295
Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
2 months ago
Sultan khan
3ad2f73653
lab test filter sorted.
2 months ago
faizatflutter
cb299c5bca
Design changes on fold
2 months ago
haroon amjad
81e1f1d447
Merge branch 'master' into haroon_dev
2 months ago
haroon amjad
1d03c1ff1c
updates
2 months ago
Haroon6138
900e374b0f
Merge pull request 'haroon_dev' ( #299 ) from haroon_dev into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/299
2 months ago
haroon amjad
19e102b52d
family member add navigation issue fixed
2 months ago
haroon amjad
783c5480f0
Updates
2 months ago
haroon amjad
018f316a01
Merge branch 'master' into haroon_dev
2 months ago
haroon amjad
fe749e57b8
Merge branch 'haroon_dev' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into haroon_dev
2 months ago
haroon amjad
d09dee9550
updates
2 months ago
Haroon6138
b3e3e5d72b
Merge pull request 'Medical File Navigation & Keyboard Fix' ( #298 ) from dev_aamir into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/298
2 months ago
aamir-csol
dfd7160030
Medical File Navigation & Keyboard Fix
2 months ago
Haroon Amjad
131837bb5c
updates
2 months ago
haroon amjad
877f73b384
Notification permission added on app launch, appointment invoice download option added, HMG Wallet added in medical file page
2 months ago
haroon amjad
dc26183467
radiology empty state fix
2 months ago
Sultan khan
e1c21b6e70
Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
2 months ago
haroon amjad
b7d58d9c9d
updates
2 months ago
haroon amjad
bfdd0fde3c
updates
2 months ago
khansultan1
1a6dff29f1
Merge pull request 'no message' ( #297 ) from dev_sultan into master
...
Reviewed-on: #297
2 months ago
Sultan khan
95223b44e9
no message
2 months ago
khansultan1
467b73ef7f
Merge pull request 'dev_sultan' ( #296 ) from dev_sultan into master
...
Reviewed-on: #296
2 months ago
Sultan khan
85b901d3d5
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
Haroon6138
a67fafad8f
Merge pull request 'Updates' ( #295 ) from haroon_dev into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/295
2 months ago
haroon amjad
e200e84b8e
Updates
2 months ago
Sultan khan
2da0d0dcaf
update and fixes
2 months ago
khansultan1
4109df4312
Merge pull request 'no message' ( #294 ) from dev_sultan into master
...
Reviewed-on: #294
2 months ago
Sultan khan
053cda6169
no message
2 months ago
Haroon6138
489b126358
Merge pull request 'haroon_dev' ( #293 ) from haroon_dev into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/293
2 months ago
haroon amjad
bc95ed35d9
Merge branch 'master' into haroon_dev
2 months ago
haroon amjad
16f3298f37
Added shared preferences check in the prescription reminders
2 months ago
khansultan1
1841eba77a
Merge pull request 'no message' ( #292 ) from dev_sultan into master
...
Reviewed-on: #292
2 months ago
Sultan khan
c7b6f191ca
no message
2 months ago
Haroon6138
eb0cf01eb3
Merge pull request 'Updates' ( #291 ) from haroon_dev into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/291
2 months ago
haroon amjad
91f38203f2
Updates
2 months ago
khansultan1
ba0a2a2a58
Merge pull request 'dev_sultan' ( #290 ) from dev_sultan into master
...
Reviewed-on: #290
2 months ago
Sultan khan
caa9da2cce
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/book_appointment/livecare/immediate_livecare_payment_details.dart
2 months ago
Sultan khan
efa7a39978
no message
2 months ago
Haroon6138
c9165b95c8
Merge pull request 'haroon_dev' ( #289 ) from haroon_dev into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/289
2 months ago
haroon amjad
0ae2b6c1a0
Merge branch 'master' into haroon_dev
2 months ago
haroon amjad
2fd4a3e1a7
Updates
2 months ago
Haroon6138
343c13f98d
Merge pull request 'haroon_dev' ( #288 ) from haroon_dev into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/288
2 months ago
haroon amjad
83f816e271
Merge branch 'master' into haroon_dev
2 months ago
Haroon6138
b0c12cceb5
Merge pull request 'Fixes & Translation' ( #287 ) from dev_aamir into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/287
2 months ago
haroon amjad
344c9de29f
updates
2 months ago
aamir-csol
597b637ca6
Fixes & Translation
2 months ago
aamir-csol
e842d85254
Fixes & Translation
2 months ago
haroon amjad
7d01e847eb
Merge branch 'master' into haroon_dev
2 months ago
haroon amjad
514bf49956
Call screen update
2 months ago
Sultan khan
e70f7aa7e3
Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
2 months ago
Haroon6138
f649767fc0
Merge pull request 'haroon_dev' ( #286 ) from haroon_dev into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/286
2 months ago
haroon amjad
df8ab0dab5
Merge branch 'master' into haroon_dev
2 months ago
haroon amjad
9e9344cd0f
updates
2 months ago
Sultan khan
46fda4e59d
Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
2 months ago
khansultan1
d60170c05f
Merge pull request 'Localization' ( #285 ) from dev_aamir into master
...
Reviewed-on: #285
2 months ago
Sultan khan
41f971fd01
Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
2 months ago
aamir-csol
877a7f083e
Merge branch 'master' into dev_aamir
2 months ago
aamir-csol
79b0c695c2
Translation
2 months ago
Haroon6138
2a4b80ff99
Merge pull request 'haroon_dev' ( #284 ) from haroon_dev into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/284
2 months ago
haroon amjad
782cd01b4b
updates
2 months ago
haroon amjad
bd89a840a0
updates
2 months ago
haroon amjad
9adac10d39
Merge branch 'master' into haroon_dev
2 months ago
khansultan1
8485018a6c
Merge pull request 'dev_sultan' ( #283 ) from dev_sultan into master
...
Reviewed-on: #283
2 months ago
Sultan khan
bd09bd04de
no message
2 months ago
Sultan khan
be5b33ce78
Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
2 months ago
khansultan1
d01aa1382a
Merge pull request 'Calendar & Localization' ( #282 ) from dev_aamir into master
...
Reviewed-on: #282
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
khansultan1
d955a1faa7
Merge pull request 'dev_sultan' ( #281 ) from dev_sultan into master
...
Reviewed-on: #281
2 months ago
Sultan khan
95ea4d4446
Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
2 months ago
Sultan khan
246d414fe1
updates and fixes
2 months ago
haroon amjad
81e7d76f3f
Merge branch 'Android_16_KB_page_size' into haroon_dev
2 months ago
haroon amjad
c12c90651e
16 KB page alignment updates
2 months ago
khansultan1
03efa7bcba
Merge pull request 'dev_sultan' ( #280 ) from dev_sultan into master
...
Reviewed-on: #280
2 months ago
Sultan khan
d9b6e9fed8
fixes and updates
2 months ago
Sultan khan
a9d34bc22c
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
updates
2 months ago
Haroon6138
ee4d6c1c81
Merge pull request 'haroon_dev' ( #279 ) from haroon_dev into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/279
2 months ago
haroon amjad
333f702f80
updates & fixes
2 months ago
haroon amjad
04db991851
updates
2 months ago
khansultan1
0826a43499
Merge pull request 'dev_sultan' ( #278 ) from dev_sultan into master
...
Reviewed-on: #278
2 months ago
Sultan khan
7654dbb4f6
no message
2 months ago
Sultan khan
b46e73565a
Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
2 months ago
khansultan1
7a9ca5ae36
Merge pull request 'Localization & Permission & Toggle Zoom In Body' ( #277 ) from dev_aamir into master
...
Reviewed-on: #277
2 months ago
aamir-csol
43e3c05ba1
Merge branch 'master' into dev_aamir
2 months ago
khansultan1
855a4e1032
Merge pull request 'dev_sultan' ( #276 ) from dev_sultan into master
...
Reviewed-on: #276
2 months ago
aamir-csol
a017433e3e
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
khansultan1
e9f812eee7
Merge pull request 'Localization' ( #274 ) from dev_aamir into master
...
Reviewed-on: #274
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
8c321c223d
Merge branch 'master' into dev_aamir
2 months ago
aamir-csol
2d61535a59
Localization & rad error fix
2 months ago
Sultan khan
ad75f6fdbc
Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
2 months ago
khansultan1
9af2c88a19
Merge pull request 'Localization' ( #273 ) from dev_aamir into master
...
Reviewed-on: #273
2 months ago
aamir-csol
42f4333a28
Merge branch 'master' into dev_aamir
2 months ago
Sultan khan
d8950b2ffc
Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
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
Sultan khan
b2bd03365c
Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
2 months ago
Haroon6138
a19cf13f0a
Merge pull request 'fix for patient share' ( #271 ) from haroon_dev into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/271
2 months ago
haroon amjad
fe82f12b33
fix for patient share
2 months ago
Sultan khan
f794d2b371
Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
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
Sultan khan
fa6bdea516
Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
2 months ago
khansultan1
fbbdfe4c32
Merge pull request 'Localization' ( #269 ) from dev_aamir into master
...
Reviewed-on: #269
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
khansultan1
e52aa24822
Merge pull request 'dev_sultan' ( #267 ) from dev_sultan into master
...
Reviewed-on: #267
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
dfc2e21e8c
no message
2 months ago
Sultan khan
1366518ce1
fixes and updates
2 months ago
khansultan1
38e1a9ae4e
Merge pull request 'Added Localized Error Handling ( faiz_dev )' ( #264 ) from faiz_dev into master
...
Reviewed-on: #264
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
khansultan1
779ea23efa
Merge pull request 'live care changes' ( #263 ) from changes into master
...
Reviewed-on: #263
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
Sultan khan
5374110bff
Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
2 months ago
khansultan1
1810071f1b
Merge pull request 'changes' ( #262 ) from changes into master
...
Reviewed-on: #262
2 months ago
tahaalam
513422cb03
Merge remote-tracking branch 'origin/master' into changes
2 months ago
tahaalam
bf7b0d922e
weather permission issue
2 months ago
Sultan khan
464991153f
Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
2 months ago
khansultan1
a651e2a650
Merge pull request 'Localization' ( #261 ) from dev_aamir into master
...
Reviewed-on: #261
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
khansultan1
b51cd52fa4
Merge pull request 'dev_sultan' ( #260 ) from dev_sultan into master
...
Reviewed-on: #260
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
khansultan1
d7794d8ab2
Merge pull request 'language changes' ( #258 ) from changes into master
...
Reviewed-on: #258
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
c91d25add3
Merge remote-tracking branch 'origin/master' into changes
2 months ago
tahaalam
cfcbaa85a3
LANGUAGE CHANGES
2 months ago
Sultan khan
086df4cdd8
Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
2 months ago
khansultan1
fbe2406d34
Merge pull request 'map changes and refferal changes' ( #255 ) from changes into master
...
Reviewed-on: #255
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
khansultan1
fecf17fb7e
Merge pull request 'dev_sultan' ( #257 ) from dev_sultan into master
...
Reviewed-on: #257
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
3 months ago
khansultan1
43497a2f11
Merge pull request 'Localization' ( #256 ) from dev_aamir into master
...
Reviewed-on: #256
3 months ago
tahaalam
138e65d6fc
Merge remote-tracking branch 'origin/master' into changes
3 months ago
aamir-csol
60b71e9b1d
Merge branch 'master' into dev_aamir
3 months ago
aamir-csol
1515fc57e5
Localization
3 months ago
tahaalam
bf9b88e79c
map prescriptiojn changes
...
date sorting for the rrt and amublance history.
weather issue,
e refferal langauge
3 months ago
Sultan khan
a81044c7eb
Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
3 months ago
khansultan1
8be2398cc6
Merge pull request 'fixes and updates' ( #254 ) from dev_sultan into master
...
Reviewed-on: #254
3 months ago
Sultan khan
94993fa6fb
fixes and updates
3 months ago
tahaalam
66e23197c5
referral lingual change
3 months ago
khansultan1
1e65a67f0e
Merge pull request 'dev_sultan' ( #253 ) from dev_sultan into master
...
Reviewed-on: #253
3 months ago
Sultan khan
42e710c61f
Rad Description & Ai Description
3 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
3 months ago
khansultan1
248faa3ac7
Merge pull request 'language changes' ( #251 ) from changes into master
...
Reviewed-on: #251
3 months ago
Sultan khan
82f2adfc3f
Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
3 months ago
Sultan khan
c1c434789e
Rad Description & Ai Description
3 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
3 months ago
tahaalam
2d36d91ab6
language and stepper changes
3 months ago
khansultan1
2c45063291
Merge pull request 'Calendar Design Changes' ( #250 ) from dev_aamir into master
...
Reviewed-on: #250
3 months ago
Sultan khan
c2dcf95d52
update and fix
3 months ago
aamir-csol
01e56e4fb5
Merge branch 'refs/heads/master' into dev_aamir
3 months ago
aamir-csol
db2ccd3be6
Date & Time New Widget For Whole App
3 months ago
tahaalam
50a597b4d3
lang changes
3 months ago
Sultan khan
6bc80a394d
Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
3 months ago
khansultan1
f14958f9e1
Merge pull request 'reminder changes' ( #248 ) from changes into master
...
Reviewed-on: #248
3 months ago
tahaalam
14771b32d3
reminder changes
3 months ago
Sultan khan
c2d468bd74
Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
3 months ago
khansultan1
5c3b1fe448
Merge pull request 'localization changes' ( #247 ) from changes into master
...
Reviewed-on: #247
3 months ago
tahaalam
5a4e5e138b
string localization changes
3 months ago
Sultan khan
898cbb0a78
Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
3 months ago
khansultan1
8e9c5ae6df
Merge pull request 'radiology ai Analysis' ( #246 ) from dev_aamir into master
...
Reviewed-on: #246
3 months ago
Sultan khan
9ff303d514
fixes and updates.
3 months ago
khansultan1
c29d5e4846
Merge pull request 'dev_sultan' ( #245 ) from dev_sultan into master
...
Reviewed-on: #245
3 months ago
tahaalam
aa22ad1e07
calender request changes
3 months ago
aamir-csol
4cd5132627
radiology ai Analysis
3 months ago
Sultan khan
ce0eda7448
no message
3 months ago
Sultan khan
0a24e6cfd1
Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
3 months ago
khansultan1
2a850c732d
Merge pull request 'dev_aamir' ( #244 ) from dev_aamir into master
...
Reviewed-on: #244
3 months ago
Sultan khan
fd3e434b0c
no message
3 months ago
aamir-csol
7d86ca0511
Merge branch 'master' into dev_aamir
3 months ago
aamir-csol
4c56137f10
calender
3 months ago
khansultan1
2c3f671a50
Merge pull request 'profile picture fix' ( #243 ) from changes into master
...
Reviewed-on: #243
3 months ago
tahaalam
c19451a6b6
profile picture fix
3 months ago
khansultan1
203c025183
Merge pull request 'no message' ( #242 ) from dev_sultan into master
...
Reviewed-on: #242
3 months ago
Sultan khan
9e5c9f9b4c
no message
3 months ago
khansultan1
81cdb4be30
Merge pull request 'dev_sultan' ( #241 ) from dev_sultan into master
...
Reviewed-on: #241
3 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
3 months ago
khansultan1
75bd5fbe15
Merge pull request 'updates and fixes' ( #240 ) from changes into master
...
Reviewed-on: #240
3 months ago
Sultan khan
69310575e5
updates
3 months ago
tahaalam
994bf95043
updates and fixes
3 months ago
Haroon6138
9cf6a63c4e
Merge pull request 'LiveCare Video Call fixes' ( #239 ) from haroon_dev into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/239
3 months ago
haroon amjad
4f60227429
LiveCare Video Call fixes
3 months ago
Sultan khan
772f6caa38
updates
3 months ago
khansultan1
bb565c58f4
Merge pull request 'langauge regarding changes' ( #237 ) from changes into master
...
Reviewed-on: #237
3 months ago
tahaalam
befcee7c65
Merge remote-tracking branch 'origin/master' into changes
...
# Conflicts:
# assets/langs/ar-SA.json
3 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
3 months ago
Sultan khan
76c3013840
no message
3 months ago
khansultan1
bd3aeefbe8
Merge pull request 'health calculator design & timer & bell icon switch changes' ( #236 ) from dev_aamir into master
...
Reviewed-on: #236
3 months ago
Sultan khan
2f4db29a70
arabic updated.
3 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
3 months ago
aamir-csol
f199fca859
health calculator design & timer & bell icon switch changes
3 months ago
aamir-csol
461fa11df3
health calculator design & timer & bell icon switch changes
3 months ago
Sultan khan
ac6e96ad6c
no message
3 months ago
tahaalam
04d14a4d82
langauge regarding changes
3 months ago
khansultan1
6104f38535
Merge pull request 'dev_sultan' ( #235 ) from dev_sultan into master
...
Reviewed-on: #235
3 months ago
Sultan khan
16e898bb6c
updates and fixes
3 months ago
aamir-csol
90bcdf674d
Merge branch 'refs/heads/master' into dev_aamir
...
# Conflicts:
# android/app/src/main/AndroidManifest.xml
3 months ago
Sultan khan
620d89fcd1
Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
3 months ago
khansultan1
bc97bded62
Merge pull request 'hot fixes' ( #234 ) from changes into master
...
Reviewed-on: #234
3 months ago
tahaalam
303fb87661
Merge remote-tracking branch 'origin/master' into changes
3 months ago
khansultan1
ef021c1fa0
Merge pull request 'dev_sultan' ( #233 ) from dev_sultan into master
...
Reviewed-on: #233
3 months ago
tahaalam
fcf990bc00
hot fixes
3 months ago
Sultan khan
cfea843c4f
updates and fixes
3 months ago
aamir-csol
2b0f8b45b0
appointment reminder & weather
3 months ago
faizatflutter
8c3121fd38
Merge branch 'master' into faiz_dev
...
# Conflicts:
# ios/Podfile.lock
3 months ago
Sultan khan
a144f30f42
no message
3 months ago
tahaalam
d97ead4e03
Merge remote-tracking branch 'origin/master' into changes
...
# Conflicts:
# lib/core/app_assets.dart
3 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.
3 months ago
tahaalam
12b611500d
application to get the fine location permission added to the manifest to get the accurate location
3 months ago
tahaalam
ebfefefec0
issue fix for the projects having distance not found if the permission for the application
3 months ago
aamir-csol
7bf69c52f0
Merge branch 'master' into dev_aamir
...
# Conflicts:
# lib/generated/codegen_loader.g.dart
3 months ago
aamir-csol
2c7c71c566
codegen
3 months ago
Haroon6138
730a4f0040
Merge pull request 'haroon_dev' ( #231 ) from haroon_dev into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/231
3 months ago
haroon amjad
be8cf08005
Merge branch 'master' into haroon_dev
3 months ago
haroon amjad
509eeb69ac
fixes
3 months ago
Haroon6138
b10142061e
Merge pull request 'fixes and updates' ( #230 ) from dev_sultan into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/230
3 months ago
haroon amjad
be08c3f228
updates
3 months ago
Sultan khan
bd5ef5e84a
no message
3 months ago
Sultan khan
beab4c1d08
no message
3 months ago
Sultan khan
8e8177e573
fixes and updates
3 months ago
Haroon6138
b7986b753b
Merge pull request 'dev_sultan' ( #229 ) from dev_sultan into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/229
3 months ago
Sultan khan
3d226c39d0
fixes and updates
3 months ago
Sultan khan
207b84e493
fixes and updates
3 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
3 months ago
Sultan khan
5f82f0db2d
fixes and updates
3 months ago
Haroon6138
46f9d38dcc
Merge pull request 'haroon_dev' ( #228 ) from haroon_dev into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/228
3 months ago
haroon amjad
76ebdf6062
Merge branch 'master' into haroon_dev
3 months ago
haroon amjad
86fa198afc
Updates & fixes
3 months ago
Sultan khan
c7875aca35
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
Updates
family file
3 months ago
Haroon6138
50c49ffb01
Merge pull request 'haroon_dev' ( #227 ) from haroon_dev into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/227
3 months ago
haroon amjad
408c0c83d9
updates
3 months ago
haroon amjad
a55bfb3b51
Merge branch 'master' into haroon_dev
3 months ago
Haroon6138
17c6d11df2
Merge pull request 'family file view' ( #225 ) from dev_aamir into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/225
3 months ago
aamir-csol
b4ab3a112c
Merge branch 'master' into dev_aamir
...
# Conflicts:
# lib/presentation/my_family/widget/family_cards.dart
3 months ago
haroon amjad
b82f4cbcb4
Merge branch 'master' into haroon_dev
3 months ago
haroon amjad
e60d2566d9
Updates
3 months ago
Sultan khan
a1e90ac0b6
Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
3 months ago
Haroon6138
3777ab8898
Merge pull request 'dev_sultan' ( #224 ) from dev_sultan into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/224
3 months ago
aamir-csol
13ce350434
family file
3 months ago
Sultan khan
1aacda08a3
no message
3 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
3 months ago
Sultan khan
21c7b05df9
no message
3 months ago
Sultan khan
fcdc96d944
no message
3 months ago
Haroon6138
c5b91a0bb5
Merge pull request 'QLine API changes handled' ( #223 ) from haroon_dev into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/223
3 months ago
haroon amjad
0566685e48
QLine API changes handled
3 months ago
Sultan khan
21ae30a8cc
profile picture upload
3 months ago
Sultan khan
5f559a44dd
profile image upload
3 months ago
Haroon6138
f836b5d67a
Merge pull request 'haroon_dev' ( #222 ) from haroon_dev into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/222
3 months ago
haroon amjad
6a687f4ff6
Updates & fixes
3 months ago
haroon amjad
f472bd49f4
Updates
3 months ago
haroon amjad
a0d9c35d0a
Merge branch 'master' into haroon_dev
3 months ago
Haroon6138
9703e23a32
Merge pull request 'switch user' ( #221 ) from dev_aamir into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/221
3 months ago
haroon amjad
5b44329972
updates
3 months ago
aamir-csol
39cbee029a
radiology ai lab analysis & lab ai analysis api end points updates.
3 months ago
aamir-csol
74479850f5
radiology ai lab analysis & lab ai analysis api end points updates.
3 months ago
aamir-csol
7a0caa05c3
Merge branch 'master' into dev_aamir
3 months ago
aamir-csol
d1e0ec31e6
radiology ai lab analysis & lab ai analysis api end points updates.
3 months ago
haroon amjad
ad0cbe1e21
updates
3 months ago
haroon amjad
b33a559305
Dental workflow implemented
3 months ago
haroon amjad
d899d21fa3
Merge branch 'master' into haroon_dev
3 months ago
haroon amjad
f8df84177d
update
3 months ago
Haroon6138
8af7be05bf
Merge pull request 'my invoice updated' ( #220 ) from dev_sultan into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/220
3 months ago
haroon amjad
bb274e80c1
updates
3 months ago
Sultan khan
3d1c415e2c
my invoice updated
3 months ago
haroon amjad
fbb758e227
Merge branch 'master' into haroon_dev
3 months ago
Haroon6138
76006dcb73
Merge pull request 'dev_sultan' ( #219 ) from dev_sultan into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/219
3 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
3 months ago
haroon amjad
5a402b45b7
color update
3 months ago
Sultan khan
a5f7bd80b2
updates
3 months ago
Haroon6138
5c9221da66
Merge pull request 'haroon_dev' ( #218 ) from haroon_dev into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/218
3 months ago
haroon amjad
75473e26bd
Merge branch 'master' into haroon_dev
3 months ago
haroon amjad
708cbb138d
Updates
...
# Conflicts:
# lib/presentation/radiology/radiology_result_page.dart
3 months ago
Haroon6138
1acd088581
Merge pull request 'haroon_dev' ( #216 ) from haroon_dev into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/216
3 months ago
Haroon6138
126423d6a1
Merge branch 'master' into haroon_dev
3 months ago
Haroon6138
909bbab48b
Merge pull request 'lang id to lab ai analysis & radiology ai analysis' ( #217 ) from dev_aamir into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/217
3 months ago
aamir-csol
5900657b52
Merge branch 'master' into dev_aamir
3 months ago
aamir-csol
2d7aa5d80d
radiology ai lab analysis & lab ai analysis api end points updates.
3 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.
3 months ago
haroon amjad
a2de3f1b14
Merge branch 'master' into haroon_dev
...
# Conflicts:
# lib/presentation/symptoms_checker/widgets/selected_organs_section.dart
3 months ago
Haroon6138
65b7b9e2ec
Merge pull request 'radiology ai lab analysis & lab ai analysis api end points updates.' ( #215 ) from dev_aamir into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/215
3 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 ,
3 months ago
Sultan khan
712e835176
ui fixes
3 months ago
haroon amjad
fe1e0fdb40
Updates
3 months ago
aamir-csol
10fa8c46cf
radiology ai lab analysis & lab ai analysis api end points updates.
3 months ago
haroon amjad
572c37785b
updates
3 months ago
haroon amjad
6939630ce0
Merge branch 'master' into haroon_dev
3 months ago
Haroon6138
a5c661b35f
Merge pull request 'family switch parent child and child and child ...' ( #214 ) from dev_aamir into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/214
3 months ago
haroon amjad
5318437941
updates
3 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
3 months ago
Sultan khan
287dcf3482
updates
3 months ago
aamir-csol
7fcee6a988
family switch parent child and child 2 ,
3 months ago
Haroon6138
6e2d87d172
Merge pull request 'haroon_dev' ( #213 ) from haroon_dev into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/213
3 months ago
haroon amjad
185f505ed9
pull down to refresh in appointment queue implemented
3 months ago
haroon amjad
991f9c7a9b
Pull to refresh implemented
3 months ago
haroon amjad
71030c0fe9
Updates & fixes
3 months ago
Haroon6138
7abee6bb5e
Merge pull request 'haroon_dev' ( #212 ) from haroon_dev into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/212
3 months ago
haroon amjad
13a4c9e0f8
updates
3 months ago
haroon amjad
e3f5bb69ac
Updates
3 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
3 months ago
Haroon6138
59fc109454
Merge pull request 'Callambulance page text and map changes' ( #211 ) from maptype into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/211
3 months ago
haroon amjad
a9f46a39cc
Updates
3 months ago
haroon amjad
92101d2b05
Merge branch 'master' into haroon_dev
...
# Conflicts:
# lib/presentation/my_family/widget/family_cards.dart
3 months ago
Sultan khan
b3fa4c9bdf
Merge remote-tracking branch 'origin/master' into maptype
3 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.
3 months ago
Haroon6138
bd85c9368d
Merge pull request 'family file changes to multi level switch' ( #210 ) from dev_aamir into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/210
3 months ago
haroon amjad
89a1da4407
Updates
3 months ago
faizatflutter
d8ab3c047f
fixed arabic api issue
3 months ago
haroon amjad
56f5151c0c
Font changes, Updates & fixes
3 months ago
tahaalam
c716490b0e
map type is added to the maps already present
3 months ago
aamir-csol
351026e42c
Merge branch 'master' into dev_aamir
3 months ago
aamir-csol
be6d33e51b
family switch parent child and child 2
3 months ago
haroon amjad
fed6cf6784
translation service changes
3 months ago
haroon amjad
453cfc07e1
Updates
3 months ago
haroon amjad
9c51f53a4d
Merge branch 'master' into haroon_dev
3 months ago
haroon amjad
1fa03fff5e
updates
3 months ago
Haroon6138
973fdc3692
Merge pull request 'graph value changed' ( #209 ) from lab-graph into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/209
3 months ago
tahaalam
07bf971575
print statement removed
3 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.
3 months ago
aamir-csol
e9ec23f506
family switch parent child and child 2
3 months ago
haroon amjad
21477f34dc
updates
3 months ago
haroon amjad
0eb9ec11d3
remote localization files added
3 months ago
haroon amjad
f929bd9017
Updates
3 months ago
haroon amjad
400e5daac0
Dr Search fixed
3 months ago
aamir-csol
aa17688de6
Merge branch 'master' into dev_aamir
3 months ago
Haroon6138
6def7b5263
Merge pull request 'haroon_dev' ( #208 ) from haroon_dev into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/208
3 months ago
haroon amjad
3d39190c62
updates & fixes
3 months ago
haroon amjad
04cbb3db40
no message
3 months ago
haroon amjad
830086a5b9
Merge branch 'master' into haroon_dev
3 months ago
Haroon6138
0c6ff3efe8
Merge pull request 'ambulance pick and drop selection changed' ( #207 ) from ambulance_selection_change into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/207
3 months ago
haroon amjad
a8620c1f72
updates
3 months ago
haroon amjad
75531c2254
Merge branch 'master' into haroon_dev
3 months ago
haroon amjad
4959392f74
Updates
3 months ago
tahaalam
7135800552
should flip value changed
3 months ago
tahaalam
a2fa661db4
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/generated/locale_keys.g.dart
3 months ago
tahaalam
bdeec6a412
hardcoded id removed that was added for uat
3 months ago
tahaalam
8a11cc03cb
pickup direction bottom sheet added and previous radio bottom sheet removed
3 months ago
aamir-csol
5be4f66718
doctor ratings.
3 months ago
haroon amjad
f7446d0d41
updates
3 months ago
aamir-csol
2a8f67bba1
family file switch back multi
3 months ago
Haroon6138
8112f9bb0a
Merge pull request 'haroon_dev' ( #206 ) from haroon_dev into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/206
3 months ago
haroon amjad
3703afe8bd
updates
3 months ago
haroon amjad
edeae70aa0
Updates
3 months ago
haroon amjad
1f290c5bfe
updates
3 months ago
haroon amjad
deca29b423
updates & fixes
3 months ago
haroon amjad
93af246700
updates
3 months ago
haroon amjad
c18bf9f2c1
Layout fix for appointment details page
3 months ago
haroon amjad
f9f2e22376
updates
3 months ago
haroon amjad
ac8189fa17
Updates
3 months ago
haroon amjad
7e73741d08
Bookmark icons added
3 months ago
haroon amjad
bd65d05e9e
Merge branch 'master' into haroon_dev
3 months ago
Haroon6138
9612b0019c
Merge pull request 'dev_sultan' ( #205 ) from dev_sultan into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/205
3 months ago
haroon amjad
a13d0cf0e4
updates
3 months ago
Sultan khan
c970a3f697
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
family file switch back issue fixed
Vital sign updates
updates
Updates
Added location option in region selection bottom sheet
Updates
Profile settings update
3 months ago
Sultan khan
6178062ed0
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 : (33 commits)
reminder start time added to the prescription
Invoices Filter
Updates
updates
Revert "graph values fix and comparision with the pdf"
graph values fix and comparision with the pdf
graph values fix and comparision with the pdf
Updates
Updates
updates
Updates
Updates
Updates
Updates
Habib Wallet updates
Changes for AI Lab analysis
App update page updates
updates
Updates
warning dialog displayed to user if the watch intented is not currently implemented
...
# Conflicts:
# lib/features/authentication/authentication_view_model.dart
3 months ago
Haroon6138
ecdef5f057
Merge pull request 'haroon_dev' ( #204 ) from haroon_dev into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/204
3 months ago
haroon amjad
6108a629a2
Merge branch 'master' into haroon_dev
3 months ago
haroon amjad
837a934d0d
updates
3 months ago
Haroon6138
c324007e61
Merge pull request 'family file switch back issue fixed' ( #203 ) from dev_aamir into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/203
3 months ago
aamir-csol
38471a773c
family file switch back issue fixed
3 months ago
Sultan khan
d3dfb2e2a5
doctor favorite in progress.
3 months ago
haroon amjad
fbb2570d8e
Vital sign updates
3 months ago
haroon amjad
db89408185
Merge branch 'master' into haroon_dev
...
# Conflicts:
# lib/generated/locale_keys.g.dart
3 months ago
Haroon6138
833ccc9ff1
Merge pull request 'watch_integration' ( #202 ) from watch_integration into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/202
3 months ago
haroon amjad
78a6d55b35
Merge branch 'master' into watch_integration
...
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/generated/locale_keys.g.dart
3 months ago
haroon amjad
841fca027c
updates
3 months ago
haroon amjad
078b236b67
Merge branch 'master' into haroon_dev
...
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/generated/locale_keys.g.dart
3 months ago
Haroon6138
ddb97423c7
Merge pull request 'reminder' ( #201 ) from reminer into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/201
3 months ago
haroon amjad
e29aba81da
Updates
3 months ago
tahaalam
a8138ba231
Merge remote-tracking branch 'origin/master' into reminer
3 months ago
tahaalam
8b829b9101
reminder start time added to the prescription
3 months ago
haroon amjad
a45980162d
Added location option in region selection bottom sheet
3 months ago
haroon amjad
444e7b562f
Merge branch 'master' into haroon_dev
3 months ago
Haroon6138
88da9af44b
Merge pull request 'Invoices Filter' ( #200 ) from dev_aamir into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/200
3 months ago
Haroon6138
7a4e28bbea
Merge pull request 'graph values fix and comparision with the pdf' ( #198 ) from labs_graph_pdf into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/198
3 months ago
haroon amjad
7611c1d58c
Updates
3 months ago
aamir-csol
f1555c76a3
Invoices Filter
3 months ago
haroon amjad
dfc666673d
Profile settings update
3 months ago
tahaalam
2babda2d63
Merge remote-tracking branch 'origin/master' into labs_graph_pdf
3 months ago
Haroon6138
f56c41c82f
Merge pull request 'haroon_dev' ( #199 ) from haroon_dev into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/199
3 months ago
haroon amjad
bf7ee71801
Merge branch 'master' into haroon_dev
3 months ago
haroon amjad
6a4793f122
Updates
3 months ago
haroon amjad
d4ed2b47bc
updates
3 months ago
tahaalam
4dce062daf
Revert "graph values fix and comparision with the pdf"
...
This reverts commit fc21746683 .
3 months ago
tahaalam
1d1c756412
graph values fix and comparision with the pdf
3 months ago
tahaalam
fc21746683
graph values fix and comparision with the pdf
3 months ago
haroon amjad
1709b80e84
Updates
3 months ago
haroon amjad
4a3d66f01a
Updates
3 months ago
haroon amjad
0ed6103b15
updates
3 months ago
haroon amjad
d053f58b7d
Updates
3 months ago
haroon amjad
d703c382e5
Updates
3 months ago
haroon amjad
3d877ed28d
Updates
3 months ago
Haroon Amjad
55b8bc162c
Updates
3 months ago
haroon amjad
08928ddd28
Habib Wallet updates
4 months ago
tahaalam
f84d5c6769
Merge remote-tracking branch 'origin/master' into watch_integration
...
# Conflicts:
# lib/splashPage.dart
4 months ago
Haroon Amjad
657f886391
Changes for AI Lab analysis
4 months ago
Haroon Amjad
30bdfac442
App update page updates
4 months ago
Haroon Amjad
d194b5a45b
updates
4 months ago
haroon amjad
1a68ffd500
Updates
4 months ago
tahaalam
50d78551c2
warning dialog displayed to user if the watch intented is not currently implemented
4 months ago
haroon amjad
abbf016694
Merge branch 'master' into haroon_dev
4 months ago
haroon amjad
2c0d010bac
updates
4 months ago
Haroon6138
24fa8e18f3
Merge pull request 'dev_sultan' ( #197 ) from dev_sultan into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/197
4 months ago
tahaalam
dda4dbeba9
merge issue resolution some import were missing from master.
4 months ago
Sultan khan
f51e37db55
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
updates
lab test description update
# Conflicts:
# lib/core/api/api_client.dart
# lib/presentation/authentication/login.dart
4 months ago
Sultan khan
4f303d8496
other country login done.
4 months ago
tahaalam
151fcf23d1
Merge remote-tracking branch 'origin/master' into watch_integration
...
# Conflicts:
# android/app/build.gradle.kts
# android/app/src/main/res/mipmap-hdpi/ic_launcher.png
# android/app/src/main/res/mipmap-mdpi/ic_launcher.png
# android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
# android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
# android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
# android/app/src/main2/res/mipmap-hdpi/ic_launcher.png
# android/app/src/main2/res/mipmap-mdpi/ic_launcher.png
# android/app/src/main2/res/mipmap-xhdpi/ic_launcher.png
# android/app/src/main2/res/mipmap-xxhdpi/ic_launcher.png
# android/app/src/main2/res/mipmap-xxxhdpi/ic_launcher.png
# android/build/reports/problems/problems-report.html
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/generated/locale_keys.g.dart
# lib/theme/colors.dart
# package/device_calendar_plus/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
# package/device_calendar_plus/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
# package/device_calendar_plus/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
# package/device_calendar_plus/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
# package/device_calendar_plus/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
# pubspec.yaml
4 months ago
Haroon6138
ff75531f26
Merge pull request 'haroon_dev' ( #196 ) from haroon_dev into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/196
4 months ago
haroon amjad
114e9e7929
Merge branch 'master' into haroon_dev
4 months ago
haroon amjad
47b50e35a1
updates
4 months ago
Sultan khan
80adf1bd2f
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
updates
updates
Dark mode persistence added in the app
Dark mode enabled
Updates & fixes
updates
updates
updates
4 months ago
haroon amjad
29447cc9fa
updates
4 months ago
haroon amjad
5b04a5a3ea
lab test description update
4 months ago
Haroon6138
cdbba6f270
Merge pull request 'haroon_dev' ( #195 ) from haroon_dev into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/195
4 months ago
haroon amjad
6e71aa7f13
updates & fixes
4 months ago
haroon amjad
fdeeed10d6
updates
4 months ago
Haroon Amjad
8de8039096
updates
4 months ago
Haroon Amjad
040ff6a80d
Dark mode persistence added in the app
4 months ago
haroon amjad
f46b3f745f
Dark mode enabled
4 months ago
Sultan khan
acfab432cc
multiple submit button commented
4 months ago
haroon amjad
074c060e36
Updates & fixes
4 months ago
haroon amjad
b4a7508f7c
updates
4 months ago
Sultan khan
d6eb6970af
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 : (29 commits)
calender package added
Android zoom fixes
updates
updates
wallet page fix
updates
fixed Ar and En files
Insurance approvals page fixes
fixed Ar En files
Added immediate patient insurance update API
updates
sickleave & medical report fixes
test description issue in lab results fixed
Updates & fixes, Filter issues fixed for lab & rad
Ancillary order fixes
NPHIES Eligibility checks implemented
updates
Android package name updated to new package details
Updates & fixes
App update page implemented
...
4 months ago
haroon amjad
961a1f5b03
updates
4 months ago
haroon amjad
68ff91561f
Merge branch 'master' into haroon_dev
4 months ago
haroon amjad
631fabad23
updates
4 months ago
Haroon6138
7b2e3a5a54
Merge pull request 'calender package added' ( #194 ) from calender_pacakge_changes into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/194
4 months ago
tahaalam
71ac91a076
calender package added
4 months ago
Haroon6138
558381b797
Merge pull request 'haroon_dev' ( #192 ) from haroon_dev into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/192
4 months ago
haroon amjad
f5aa12a04b
Android zoom fixes
4 months ago
haroon amjad
b75f0c7ee4
updates
4 months ago
haroon amjad
79b23584db
updates
4 months ago
haroon amjad
295709cbc2
Merge branch 'master' into haroon_dev
4 months ago
haroon amjad
1286455f8c
wallet page fix
4 months ago
Haroon6138
8878558f12
Merge pull request 'fatima' ( #191 ) from fatima into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/191
4 months ago
haroon amjad
5e16169867
updates
4 months ago
Fatimah.Alshammari
ee358259f5
Merge branch 'refs/heads/master' into fatima
...
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
4 months ago
Fatimah.Alshammari
8368dbd4d9
fixed Ar and En files
4 months ago
Haroon6138
faf00b88ef
Merge pull request 'haroon_dev' ( #190 ) from haroon_dev into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/190
4 months ago
haroon amjad
cf27430e29
Merge branch 'master' into haroon_dev
4 months ago
haroon amjad
dffed5df6b
Insurance approvals page fixes
4 months ago
Fatimah.Alshammari
cf3c14281c
fixed Ar En files
4 months ago
Haroon Amjad
d9013a1dc2
Added immediate patient insurance update API
4 months ago
haroon amjad
a25df34f42
updates
4 months ago
haroon amjad
6cc058e86d
updates
4 months ago
tahaalam
fbe9cd9dff
package change activity
4 months ago
haroon amjad
84224ae61b
sickleave & medical report fixes
4 months ago
tahaalam
7100283a9d
package change activity
4 months ago
tahaalam
3f9046f1e4
Merge remote-tracking branch 'origin/master' into watch_integration
...
# Conflicts:
# android/app/src/main/AndroidManifest.xml
# android/app/src/main/kotlin/com/ejada/hmg/MainActivity.kt
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# ios/Runner.xcodeproj/project.pbxproj
# lib/core/api_consts.dart
# lib/generated/locale_keys.g.dart
4 months ago
tahaalam
b334f631bd
samsung sdk health aar
4 months ago
tahaalam
a395d9b93a
ios health connect added
4 months ago
Haroon Amjad
c2028841c5
test description issue in lab results fixed
4 months ago
tahaalam
bfeb3dce4e
data integration along with the data representation
4 months ago
haroon amjad
dc0e4e5eb6
Updates & fixes, Filter issues fixed for lab & rad
4 months ago
Fatimah.Alshammari
46c8fbf0f6
Merge branch 'refs/heads/master' into fatima
...
# Conflicts:
# assets/langs/ar-SA.json
# lib/generated/locale_keys.g.dart
4 months ago
Haroon6138
658b77aa37
Merge pull request 'haroon_dev' ( #188 ) from haroon_dev into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/188
4 months ago
haroon amjad
2a819a2d97
Ancillary order fixes
4 months ago
haroon amjad
9413e54d3a
NPHIES Eligibility checks implemented
4 months ago
Sultan khan
b91850d388
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 : (67 commits)
added women support in symptoms checker module.
family fil fixes
PMA-1100
updates
updates
Updates & fixes
updates
Ai Analysis & PMA-(1078,1079)
update
updates
arabic fixes
arabic fixes
Vital sign data connected to Symptom checker
Date format changed to en-US
confirm button added
iOS BundleID changes
Services price list implemented
Indoor navigation implemented
updates & fixes
JIRA bug fixes & updates
...
# Conflicts:
# lib/presentation/authentication/register_step2.dart
# lib/presentation/vital_sign/vital_sign_page.dart
4 months ago
Haroon Amjad
105ab2326a
updates
4 months ago
haroon amjad
ec506869cc
Android package name updated to new package details
4 months ago
haroon amjad
05b6d02e4c
Updates & fixes
4 months ago
tahaalam
5ea70397e2
samsung integration addded
4 months ago
Sultan khan
c416d84a3a
register insurance in progress.
5 months ago
haroon amjad
8309f311e6
App update page implemented
5 months ago
haroon amjad
c6ee3c453f
contact us bottom sheet icons changed
5 months ago
haroon amjad
4b710523e8
Feedback status implemented
5 months ago
haroon amjad
e1788f1187
Merge branch 'master' into haroon_dev
5 months ago
Haroon6138
aab1f6411b
Merge pull request 'Female support in symptoms checker module and few bug fixes (faiz_dev)' ( #187 ) from faiz_dev into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/187
5 months ago
faizatflutter
afae41c410
Merge branch 'master' into faiz_dev
5 months ago
faizatflutter
b44ae1e838
added women support in symptoms checker module.
5 months ago
haroon amjad
2be65cba51
Inactive Insurance case handled
5 months ago
haroon amjad
530b87282f
updates & fixes
5 months ago
haroon amjad
2e1f4e87e0
AI Lab Analysis updates
5 months ago
haroon amjad
87e0c5b6eb
Merge branch 'master' into haroon_dev
5 months ago
Haroon6138
2fb787c31f
Merge pull request 'dev_aamir' ( #186 ) from dev_aamir into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/186
5 months ago
haroon amjad
1575a8e308
Feedback status implementation contd.
5 months ago
aamir-csol
23e2809fdb
Merge branch 'master' into dev_aamir
5 months ago
aamir-csol
7296bfb6fc
family fil fixes
5 months ago
tahaalam
df0b926e59
heart rate sleep data and steps count obtained
5 months ago
haroon amjad
0da4b63d74
Merge branch 'master' into haroon_dev
5 months ago
Haroon6138
2162b8102a
Merge pull request 'PMA-1100' ( #185 ) from dev_aamir into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/185
5 months ago
haroon amjad
305b3274c0
Symptoms checker doctor selection implemented
5 months ago
haroon amjad
5015747580
LiveCare changes
5 months ago
aamir-csol
c48cb78cd9
PMA-1100
5 months ago
tahaalam
4912f686f9
platform channel added.
5 months ago
Haroon6138
d76bd2a295
Merge pull request 'haroon_dev' ( #184 ) from haroon_dev into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/184
5 months ago
Haroon Amjad
cb44e902a3
Merge branch 'haroon_dev' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into haroon_dev
5 months ago
Haroon Amjad
9b3c172dd1
updates
5 months ago
haroon amjad
20ed54243b
updates
5 months ago
haroon amjad
01c21377aa
Updates & fixes
5 months ago
tahaalam
183bcce003
merge issue resolution
5 months ago
tahaalam
02398d3bb4
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# ios/Runner.xcodeproj/project.pbxproj
# lib/generated/locale_keys.g.dart
# lib/theme/colors.dart
5 months ago
tahaalam
d137e1166d
watch integration ui added.
5 months ago
Haroon6138
e62df81ba2
Merge pull request 'dev_aamir' ( #182 ) from dev_aamir into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/182
5 months ago
aamir-csol
a105d87241
Merge branch 'master' into dev_aamir
...
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/features/authentication/authentication_view_model.dart
# lib/generated/locale_keys.g.dart
5 months ago
Haroon6138
48718a3406
Merge pull request 'haroon_dev' ( #181 ) from haroon_dev into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/181
5 months ago
haroon amjad
68f5e64557
updates
5 months ago
aamir-csol
2c7f4ddc48
Ai Analysis & PMA-(1078,1079)
5 months ago
haroon amjad
95b65ed8a5
Merge branch 'haroon_dev' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into haroon_dev
...
# Conflicts:
# lib/features/book_appointments/book_appointments_view_model.dart
5 months ago
haroon amjad
102690b2b8
update
5 months ago
haroon amjad
c9279e2272
updates
5 months ago
Haroon Amjad
23abbebf9e
arabic fixes
5 months ago
Haroon Amjad
a4573c8710
arabic fixes
5 months ago
Haroon Amjad
4ce1e912ce
Vital sign data connected to Symptom checker
5 months ago
Haroon Amjad
eeaa22357f
Date format changed to en-US
5 months ago
haroon amjad
000c403f6b
confirm button added
5 months ago
Fatimah.Alshammari
47ec43850d
Merge branch 'master' into fatima
5 months ago
haroon amjad
f09d478a03
iOS BundleID changes
5 months ago
haroon amjad
3c9c3032a5
Services price list implemented
5 months ago
haroon amjad
2ab3e178a2
Indoor navigation implemented
5 months ago
haroon amjad
9ed016ad8b
updates & fixes
5 months ago
Haroon6138
a6344d6a81
Merge pull request 'haroon_dev' ( #180 ) from haroon_dev into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/180
5 months ago
haroon amjad
92e745fe49
Merge branch 'master' into haroon_dev
5 months ago
haroon amjad
3af43dc676
JIRA bug fixes & updates
5 months ago
Fatimah.Alshammari
0d6d23dbbc
Merge branch 'master' into fatima
5 months ago
haroon amjad
66ff6ed8b6
Prescription download changes
5 months ago
Haroon6138
478be330df
Merge pull request 'haroon_dev' ( #179 ) from haroon_dev into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/179
5 months ago
haroon amjad
85ccf41d04
Updates & fixes for Habib Wallet, Insurance update, Immediate LiveCare
5 months ago
haroon amjad
b309342cdc
lab fixes
5 months ago
Haroon6138
ee3dd0b5c7
Merge pull request 'haroon_dev' ( #178 ) from haroon_dev into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/178
5 months ago
haroon amjad
5c684a6a0d
Doctor Rating details implemented
5 months ago
Fatimah.Alshammari
f340f4fb8f
Merge branch 'master' into fatima
...
# Conflicts:
# assets/langs/ar-SA.json
# lib/generated/locale_keys.g.dart
5 months ago
haroon amjad
bafe835ebd
Scheduled livecare appointment booking fixes
5 months ago
haroon amjad
8472a45530
updates
5 months ago
Haroon6138
31a7aa907b
Merge pull request 'haroon_dev' ( #177 ) from haroon_dev into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/177
5 months ago
haroon amjad
70a6d90ce3
updates & fixes
5 months ago
haroon amjad
8740178f8c
Merge branch 'master' into haroon_dev
5 months ago
haroon amjad
cfd0c16738
updates & fixes
5 months ago
Haroon6138
df3b36eb00
Merge pull request 'dev_aamir' ( #176 ) from dev_aamir into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/176
5 months ago
aamir-csol
7014ac397e
Merge remote-tracking branch 'origin/master' into dev_aamir
...
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/generated/locale_keys.g.dart
5 months ago
Haroon6138
63cdced84e
Merge pull request 'haroon_dev' ( #175 ) from haroon_dev into master
...
Reviewed-on: #175
5 months ago
Haroon Amjad
49542a9112
updates & fixes
5 months ago
Haroon Amjad
1ae1212733
Merge branch 'master' into haroon_dev
5 months ago
Haroon6138
7f8b2979e7
Merge pull request 'dev_sikander' ( #174 ) from dev_sikander into master
...
Reviewed-on: #174
5 months ago
Haroon Amjad
537d93915e
Zoom SDK fixes
5 months ago
Sikander Saleem
f376f430c6
Merge branch 'refs/heads/master' into dev_sikander
5 months ago
Sikander Saleem
b9350afead
ui improvements
5 months ago
aamir-csol
2c2cb8bb99
family file button fix
5 months ago
aamir-csol
8c7f4afe76
family file button fix
5 months ago
Haroon6138
c50f8d63ef
Merge pull request 'haroon_dev' ( #171 ) from haroon_dev into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/171
5 months ago
Haroon6138
118da8da36
Merge pull request 'Wd: Unware clinic bottom sheet shown on appointment page.' ( #170 ) from unware-clinic-bottomsheet into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/170
5 months ago
haroon amjad
4e6d3d3178
SmartWatch implementation contd.
5 months ago
faizatflutter
9c7cfde5f4
ui improvements
5 months ago
tahaalam
f78eb5da67
Wd: Unware clinic bottom sheet shown on appointment page.
5 months ago
Sikander Saleem
6e1eb0d0bb
ui improvements
5 months ago
Sikander Saleem
41a4005d41
Merge branch 'refs/heads/master' into dev_sikander
5 months ago
haroon amjad
940ce5ff14
updates
5 months ago
haroon amjad
05e87bbb2e
Merge branch 'master' into haroon_dev
5 months ago
haroon amjad
ae3ed83dd0
contact us page changes
5 months ago
Haroon6138
245b66150f
Merge pull request 'dev_aamir' ( #169 ) from dev_aamir into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/169
5 months ago
aamir-csol
0c2fe81c99
Merge branch 'master' into dev_aamir
5 months ago
aamir-csol
bb4719bd87
logout & family file fix & PMA-1047
5 months ago
Fatimah.Alshammari
931e3fa968
Merge branch 'refs/heads/master' into fatima
...
# Conflicts:
# assets/langs/ar-SA.json
# lib/generated/locale_keys.g.dart
5 months ago
Sikander Saleem
6e4d7519fb
Merge branch 'refs/heads/master' into dev_sikander
...
# Conflicts:
# lib/presentation/home/widgets/habib_wallet_card.dart
5 months ago
Sikander Saleem
2648f304f6
Merge branch 'refs/heads/master' into dev_sikander
...
# Conflicts:
# lib/core/app_assets.dart
# lib/presentation/hmg_services/services_page.dart
# lib/presentation/home/data/landing_page_data.dart
# lib/presentation/home/landing_page.dart
# lib/presentation/home/widgets/habib_wallet_card.dart
# lib/presentation/home/widgets/small_service_card.dart
# lib/presentation/lab/lab_orders_page.dart
# lib/widgets/appbar/collapsing_list_view.dart
5 months ago
Haroon6138
cd4fbb1905
Merge pull request 'updates & fixes' ( #168 ) from haroon_dev into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/168
5 months ago
haroon amjad
b0708d85d9
updates & fixes
5 months ago
Haroon6138
37909feb50
Merge pull request 'haroon_dev' ( #167 ) from haroon_dev into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/167
5 months ago
haroon amjad
20216cd4ae
Merge branch 'master' into haroon_dev
5 months ago
Haroon6138
22c388da23
Merge pull request 'dev_aamir' ( #166 ) from dev_aamir into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/166
5 months ago
aamir-csol
2bbfe1f131
Merge branch 'master' into dev_aamir
...
# Conflicts:
# lib/presentation/profile_settings/profile_settings.dart
5 months ago
aamir-csol
8b701255ed
logout & family file fix
5 months ago
haroon amjad
7ead6d79e5
updates
5 months ago
haroon amjad
3e9a381ed7
Merge branch 'master' into haroon_dev
5 months ago
Haroon6138
cf7ff4ce1d
Merge pull request 'Added Arabic Support for symptoms checker (faiz_dev)' ( #165 ) from faiz_dev into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/165
5 months ago
haroon amjad
e4b6360808
Services Page fix
5 months ago
haroon amjad
f46f978326
Clinic icons updated
5 months ago
faizatflutter
14f3c6cb81
Added Arabic Support for symptoms checker
5 months ago
haroon amjad
10a5a6f558
Ask Doctor implemented
5 months ago
Haroon6138
e8ca8b42bf
Merge pull request 'haroon_dev' ( #164 ) from haroon_dev into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/164
5 months ago
haroon amjad
4188365e6d
readme update
5 months ago
haroon amjad
d2deb974b1
symptoms merge
5 months ago
haroon amjad
f48eb631ab
Merge branch 'master' into haroon_dev
5 months ago
Haroon6138
b6c665cbf1
Merge pull request 'Symptoms Checker Module (faiz_dev)' ( #163 ) from faiz_dev into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/163
5 months ago
haroon amjad
f54ce71177
translation changes
5 months ago
faizatflutter
07447e148b
Symptoms Checker flow is completed
5 months ago
haroon amjad
6faca94b89
updates
5 months ago
Fatimah.Alshammari
d027415302
fixed errors
5 months ago
haroon amjad
99282f34e3
Added language change option in landing page
5 months ago
aamir-csol
418297b6fb
Merge branch 'master' into dev_aamir
...
# Conflicts:
# lib/core/api_consts.dart
5 months ago
faizatflutter
4ceca016bb
Merge branch 'master' into faiz_dev
...
# Conflicts:
# lib/presentation/hmg_services/services_page.dart
# pubspec.lock
5 months ago
faizatflutter
3bdc4e246f
refactor
5 months ago
haroon amjad
9ef70a250d
translation updates
5 months ago
haroon amjad
5b24dadb51
Merge branch 'master' into haroon_dev
5 months ago
Sikander Saleem
40ba1bd246
ui improvements
5 months ago
haroon amjad
3fc1302eaf
New Flutter App param added
5 months ago
Sikander Saleem
e38892ff2d
Merge branch 'refs/heads/master' into dev_sikander
...
# Conflicts:
# lib/presentation/habib_wallet/habib_wallet_page.dart
# lib/presentation/hmg_services/services_page.dart
# lib/presentation/home/landing_page.dart
# lib/presentation/home/widgets/habib_wallet_card.dart
# lib/presentation/insurance/insurance_home_page.dart
# lib/presentation/lab/lab_orders_page.dart
# lib/presentation/medical_file/medical_file_page.dart
# lib/presentation/profile_settings/profile_settings.dart
# lib/presentation/radiology/radiology_orders_page.dart
# lib/widgets/appbar/collapsing_list_view.dart
5 months ago
Haroon6138
838929591a
Merge pull request 'haroon_dev' ( #162 ) from haroon_dev into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/162
5 months ago
haroon amjad
5feacfaf27
Translation updates
5 months ago
haroon amjad
39af08ddc3
Translation updates
5 months ago
Haroon6138
f026ae1d62
Merge pull request 'haroon_dev' ( #161 ) from haroon_dev into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/161
6 months ago
haroon amjad
e5f24b9c06
updates
6 months ago
haroon amjad
00475dc100
Merge branch 'master' into haroon_dev
6 months ago
Haroon6138
23b92cef41
Merge pull request 'dev_sultan' ( #160 ) from dev_sultan into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/160
6 months ago
haroon amjad
3ff9628cd3
Translation updates
6 months ago
aamir-csol
bb72c7f7d6
Merge branch 'master' into dev_aamir
...
# Conflicts:
# lib/core/api_consts.dart
# lib/presentation/hmg_services/services_page.dart
# pubspec.lock
6 months ago
aamir-csol
0017c0601b
blood donation changes
6 months ago
Sultan khan
7d8537fae6
Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
6 months ago
Sultan khan
1edeff439e
notifications page updates
6 months ago
Haroon6138
a1beacc36e
Merge pull request 'haroon_dev' ( #159 ) from haroon_dev into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/159
6 months ago
haroon amjad
3e6ee8c10c
Merge branch 'master' into haroon_dev
...
# Conflicts:
# lib/routes/app_routes.dart
6 months ago
haroon amjad
87422e8e05
translation updates
6 months ago
Sikander Saleem
0b9df1f22b
collapsing toolbar behaviour changed as like barq
6 months ago
Haroon6138
179b86b2b0
Merge pull request 'fatima' ( #158 ) from fatima into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/158
6 months ago
Fatimah.Alshammari
f6aa1fc7ac
Merge branch 'refs/heads/master' into fatima
6 months ago
Fatimah.Alshammari
9795276ef9
fixed errors
6 months ago
Sikander Saleem
45b013a048
UI/UX improvements - insurance update.
6 months ago
Sikander Saleem
1599cfed4e
UI/UX improvements-1.
6 months ago
haroon amjad
96ccb40f36
Merge branch 'master' into haroon_dev
6 months ago
Haroon6138
bb7c05493a
Merge pull request 'fatima' ( #157 ) from fatima into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/157
6 months ago
haroon amjad
169215fd7b
translation changes
6 months ago
Fatimah.Alshammari
97a47ce4e8
Merge branch 'refs/heads/master' into fatima
...
# Conflicts:
# lib/core/dependencies.dart
# lib/routes/app_routes.dart
6 months ago
Fatimah.Alshammari
287e2b9562
fixed QR
6 months ago
Sikander Saleem
77a04e637e
UI/UX improvements.
6 months ago
Sultan khan
8b5c4d7575
Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
...
# Conflicts:
# lib/core/dependencies.dart
# lib/routes/app_routes.dart
6 months ago
Sultan khan
8c92df8648
contact us page fix
6 months ago
aamir-csol
a816afadea
Merge branch 'master' into dev_aamir
...
# Conflicts:
# lib/core/dependencies.dart
# lib/presentation/hmg_services/services_page.dart
6 months ago
aamir-csol
d76ff5828f
fixes
6 months ago
haroon amjad
8f428297cb
Arabic translations added
6 months ago
Haroon6138
e9d3b3680a
Merge pull request 'haroon_dev' ( #156 ) from haroon_dev into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/156
6 months ago
haroon amjad
a0008c9104
Nearest Appointment sorting fixed
6 months ago
Fatimah.Alshammari
1d224702ac
Merge branch 'refs/heads/master' into fatima
6 months ago
Fatimah.Alshammari
69666a6f6c
fixed button
6 months ago
haroon amjad
475a9b9acb
Merge branch 'master' into haroon_dev
6 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
6 months ago
Haroon6138
d1b1bbf777
Merge pull request 'dev_sultan' ( #154 ) from dev_sultan into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/154
6 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
6 months ago
Sultan khan
42222804fd
fix graph dot and bp graph.
6 months ago
aamir-csol
bf210e664d
Merge branch 'master' into dev_aamir
6 months ago
aamir-csol
6725ab028d
doctor search filter design update & switch user bug fix.
6 months ago
haroon amjad
609ae6ab83
updates
6 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
6 months ago
haroon amjad
44ce353dac
updates
6 months ago
Haroon6138
b5753769b7
Merge pull request 'fatima' ( #152 ) from fatima into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/152
6 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
6 months ago
haroon amjad
fc750174fe
Merge branch 'master' into haroon_dev
6 months ago
haroon amjad
d848291930
updates
6 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
6 months ago
Sultan khan
16da0f4d0a
Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
6 months ago
Sultan khan
8ee0e3b4ea
no message
6 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
6 months ago
haroon amjad
e454c9c991
Merge branch 'master' into haroon_dev
...
# Conflicts:
# lib/core/api_consts.dart
# lib/core/dependencies.dart
6 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
6 months ago
Haroon6138
2240c6cc65
Merge pull request 'Health Trackers Feature (faiz_dev)' ( #150 ) from faiz_dev into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/150
6 months ago
Sultan khan
0514716910
no message
6 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
6 months ago
Sultan khan
ac0d72b3ff
vital sign finalized.
6 months ago
aamir-csol
f62c7c9b20
Merge branch 'master' into dev_aamir
6 months ago
aamir-csol
c11e859df1
search doctor by name filter.
6 months ago
haroon amjad
91c16f13d1
Merge branch 'master' into haroon_dev
...
# Conflicts:
# lib/core/app_assets.dart
6 months ago
haroon amjad
1c0842ab95
updates
6 months ago
haroon amjad
02930a901e
Indoor navigation implementation & Landing page swiper card updates
6 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
6 months ago
Fatimah.Alshammari
8ae81d2b24
fixed parking qr
6 months ago
Sultan khan
34e8386ca1
Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
6 months ago
Sultan khan
cc255e9c9a
vital sign detail page
6 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
6 months ago
Fatimah.Alshammari
62bb667cb8
added parking part
6 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
6 months ago
Fatimah.Alshammari
a53602dc8c
added monthly report
6 months ago
Fatimah.Alshammari
7a03242396
added monthly report
6 months ago
Fatimah.Alshammari
68f044de52
added monthly report
6 months ago
Fatimah.Alshammari
c9de23347a
fix error
7 months ago
Fatimah.Alshammari
190492a191
Merge branch 'refs/heads/master' into fatima
...
# Conflicts:
# lib/routes/app_routes.dart
7 months ago
Fatimah.Alshammari
3d8daeb58d
Merge branch 'refs/heads/master' into fatima
...
# Conflicts:
# lib/core/app_assets.dart
# lib/core/dependencies.dart
# lib/core/utils/calendar_utils.dart
# lib/features/hmg_services/models/ui_models/hmg_services_component_model.dart
# lib/main.dart
# lib/presentation/hmg_services/services_page.dart
# lib/presentation/hmg_services/services_view.dart
# lib/presentation/medical_file/medical_file_page.dart
# lib/routes/app_routes.dart
# lib/theme/colors.dart
# pubspec.yaml
7 months ago
Fatimah.Alshammari
0b3fea230f
monthly report
7 months ago
Fatimah.Alshammari
86a91ab383
Merge branch 'refs/heads/master' into fatima
7 months ago
Fatimah.Alshammari
89ff10f506
Merge branch 'refs/heads/master' into fatima
...
# Conflicts:
# lib/core/dependencies.dart
# lib/main.dart
# lib/theme/colors.dart
7 months ago
Fatimah.Alshammari
8191852f4d
Merge branch 'refs/heads/master' into fatima
...
# Conflicts:
# lib/core/dependencies.dart
# lib/main.dart
7 months ago
Fatimah.Alshammari
e17d3cde87
fix toggle
7 months ago
Fatimah.Alshammari
77242825bb
fix toggle
7 months ago
Fatimah.Alshammari
27ad4e0764
Merge branch 'refs/heads/master' into fatima
...
# Conflicts:
# lib/core/utils/utils.dart
# lib/presentation/emergency_services/call_ambulance/tracking_screen.dart
# lib/presentation/home/landing_page.dart
7 months ago
Fatimah.Alshammari
eae16eec44
active medication
7 months ago
Fatimah.Alshammari
3f123d12d6
Merge remote-tracking branch 'refs/remotes/origin/master' into fatima
...
# Conflicts:
# lib/core/api_consts.dart
# lib/core/utils/utils.dart
# lib/main.dart
8 months ago
Fatimah.Alshammari
de8c7bc605
active medication
8 months ago
Fatimah.Alshammari
cb56503622
Merge remote-tracking branch 'refs/remotes/origin/master' into fatima
9 months ago
Fatimah.Alshammari
e8319a0d3f
active medication
9 months ago