Commit Graph

1445 Commits (619c64336725f35db5957af1ec49564e1c8df495)

Author SHA1 Message Date
Sikander Saleem 282bf04094 Merge branch 'refs/heads/design_3.0_loan_module' into design_3.0_medical_gas_inspection 2 months ago
Sikander Saleem 1ebd6f2fbc Merge branch 'refs/heads/design_3.0_cx_module' into design_3.0_loan_module
# Conflicts:
#	lib/controllers/providers/api/all_requests_provider.dart
2 months ago
Sikander Saleem b3f8dabf2f Merge branch 'refs/heads/design_3.0_internal_audit_module' into design_3.0_cx_module 2 months ago
Sikander Saleem 2b274f1f83 bug 1518 fixed. 2 months ago
Sikander Saleem 17210195db uat improvements. md->department, enable recall and alert for quality user. 2 months ago
Sikander Saleem 9637909531 demo module starting... 2 months ago
Sikander Saleem 86f96a8f62 medical gas ui added. 2 months ago
Sikander Saleem db2175b7f5 quality auditor role added. 2 months ago
Sikander Saleem d765bf0b83 medical gas cont. 2 months ago
Sikander Saleem 883210e61b merge conflict fixed 2 months ago
Sikander Saleem ea05e965d5 Merge branch 'refs/heads/design_3.0_cx_module' into design_3.0_loan_module
# Conflicts:
#	lib/modules/tm_module/device_transfer/device_transfer_details.dart
#	lib/views/widgets/gas_refill/gas_refill_list.dart
2 months ago
Sikander Saleem 58ff17e008 Merge branch 'refs/heads/design_3.0_internal_audit_module' into design_3.0_cx_module
# Conflicts:
#	lib/controllers/api_routes/urls.dart
2 months ago
Sikander Saleem 7d7a34a6d5 Merge branch 'refs/heads/design_3.0_traf_module' into design_3.0_internal_audit_module 2 months ago
Sikander Saleem 16de0eaa41 Merge branch 'refs/heads/design_3.0_asset_inventory_module' into design_3.0_traf_module
# Conflicts:
#	lib/controllers/api_routes/urls.dart
2 months ago
Sikander Saleem e1efd59252 request no, md and site details, remove item if no finding selected and dashboard api added for quality user. 2 months ago
Sikander Saleem 4b991d807c v1.4.0+31 uploaded on stores. 2 months ago
Sikander Saleem f2ebadf1b7 attachment list view added in files list widget. 3 months ago
Sikander Saleem 4763132302 attachment as listview added. 3 months ago
Sikander Saleem bf2b777f8d chat improvements. 3 months ago
Sikander Saleem 5ff9fc5808 chat added gas refill, transfer asset internal & external, task request. 3 months ago
WaseemAbbasi22 789522b79b asset delivery modules design flow completed 3 months ago
Sikander Saleem a9362d90f5 asset information auto fetch from CM workOrder. 3 months ago
Sikander Saleem 30bf847e6e department dropdown return first index item fixed. 3 months ago
Sikander Saleem f0c003e6fa disabled loan type dropdown added. 3 months ago
Sikander Saleem 0a9dd86ce0 improvements. 3 months ago
Sikander Saleem b407103002 Merge branch 'refs/heads/design_3.0_cx_module' into design_3.0_loan_module 3 months ago
Sikander Saleem af69b2959b Merge branch 'refs/heads/design_3.0_internal_audit_module' into design_3.0_cx_module
# Conflicts:
#	lib/controllers/api_routes/api_manager.dart
#	lib/controllers/api_routes/urls.dart
3 months ago
Sikander Saleem 12cd68a30f Merge branch 'refs/heads/design_3.0_traf_module' into design_3.0_internal_audit_module
# Conflicts:
#	lib/controllers/providers/api/all_requests_provider.dart
#	lib/new_views/pages/land_page/create_request-type_bottomsheet.dart
3 months ago
Sikander Saleem f4d47244be Merge branch 'refs/heads/design_3.0_asset_inventory_module' into design_3.0_traf_module
# Conflicts:
#	lib/controllers/api_routes/urls.dart
#	lib/controllers/providers/api/all_requests_provider.dart
#	lib/controllers/providers/api/user_provider.dart
#	lib/new_views/pages/land_page/create_request-type_bottomsheet.dart
#	lib/new_views/pages/land_page/my_request/all_requests_filter_page.dart
#	lib/new_views/pages/land_page/my_request/my_requests_page.dart
3 months ago
Sikander Saleem 05e97a5c47 apk provided for pre-release. 3 months ago
Sikander Saleem 7cdd3aa58a dev to uat env 3 months ago
Sikander Saleem 16d5eb32b9 assign fe user model updated. 3 months ago
Sikander Saleem 5d2291a30f loan option for in progress requests. 3 months ago
Sikander Saleem 290cdf29d8 Merge branch 'refs/heads/design_3.0_cx_module' into design_3.0_loan_module
# Conflicts:
#	lib/modules/cm_module/cm_detail_page.dart
#	lib/modules/cx_module/chat/chat_page.dart
3 months ago
Sikander Saleem 8e29c84c70 loan improvements. 3 months ago
waseemabbasi22 2962f248e0 timer fixes 3 months ago
Sikander Saleem 07ec866315 loan attachment added & improvements. 3 months ago
Sikander Saleem e7e0f7375c chat fix when contact persons list is empty. 3 months ago
Sikander Saleem ff7ee7f8bb user module permission api added. asset inventory switch to user permissions. 3 months ago
Sikander Saleem 22fd3c8cc9 loan equipment item view added; 3 months ago
Sikander Saleem e76067bdac LoanTypeId param added. 3 months ago
Sikander Saleem 60511b60cf files refactoring 3 months ago
Sikander Saleem 09762fd278 files refactoring 3 months ago
Sikander Saleem 1a3861d816 files refactoring 3 months ago
Sikander Saleem 16a2fa2b26 files refactoring 3 months ago
Sikander Saleem 62cc13b1c0 standard / backup loan request creation. 3 months ago
waseemabbasi22 05d9224a08 Merge remote-tracking branch 'origin/design_3.0_loan_module' into design_3.0_loan_module
# Conflicts:
#	lib/controllers/api_routes/urls.dart
3 months ago
waseemabbasi22 de48ca97bd initial test done 3 months ago
waseemabbasi22 c9d2df4ea7 Merge remote-tracking branch 'origin/design_3.0_internal_audit_module' into design_3.0_internal_audit_module
# Conflicts:
#	lib/controllers/api_routes/urls.dart
3 months ago
waseemabbasi22 b4943aff3d initial test done 3 months ago
Sikander Saleem a3509e9464 Merge branch 'refs/heads/design_3.0_cx_module' into design_3.0_loan_module
# Conflicts:
#	lib/main.dart
#	lib/new_views/pages/land_page/create_request-type_bottomsheet.dart
3 months ago
Sikander Saleem f6f5048cc8 Merge branch 'refs/heads/design_3.0_internal_audit_module' into design_3.0_cx_module
# Conflicts:
#	lib/controllers/api_routes/urls.dart
#	lib/main.dart
#	pubspec.lock
#	pubspec.yaml
3 months ago
Sikander Saleem 60125bb6d9 Merge branch 'refs/heads/design_3.0_traf_module' into design_3.0_internal_audit_module 3 months ago
Sikander Saleem 9eb828cc75 Merge branch 'refs/heads/design_3.0_asset_inventory_module' into design_3.0_traf_module
# Conflicts:
#	lib/controllers/api_routes/urls.dart
3 months ago
Sikander Saleem 92a94577d5 merge conflict resolved. 3 months ago
Sikander Saleem 6ef6bc40a0 Merge branch 'refs/heads/design_3.0_traf_module' into design_3.0_internal_audit_module
# Conflicts:
#	lib/controllers/api_routes/urls.dart
#	lib/dashboard_latest/widgets/request_category_list.dart
#	lib/new_views/pages/land_page/requests/request_paginated_listview.dart
#	lib/new_views/pages/land_page/widgets/request_item_view_list.dart
3 months ago
waseemabbasi22 c02fc2f1b1 api integration inprogress 3 months ago
waseemabbasi22 7291d1b4d8 Merge branch 'design_3.0_traf_module' into design_3.0_loan_module
# Conflicts:
#	lib/controllers/api_routes/urls.dart
#	lib/new_views/pages/land_page/create_request-type_bottomsheet.dart
3 months ago
Sikander Saleem bbeabda38d parameter added for push notifications. 3 months ago
waseemabbasi22 0ffc0f650f improvements 3 months ago
waseemabbasi22 c4160ff98b improvements 3 months ago
WaseemAbbasi22 a2453e8c88 loan form desing created 3 months ago
Sikander Saleem 4f78e23922 chat widget finalized. 3 months ago
WaseemAbbasi22 542070c791 improvements 3 months ago
WaseemAbbasi22 255691f47a loan design in progress 3 months ago
Sikander Saleem e1c06a1857 site id improvement 3 months ago
Sikander Saleem 59d21ae72e jira 1430 & 1434 & 1437 fixed. 3 months ago
Sikander Saleem e3857149e7 improvements 3 months ago
Sikander Saleem 1f074b33e5 chat finalized. 3 months ago
Sikander Saleem c31771aaa7 chat improvements 3 months ago
Sikander Saleem e52caee730 chat improvements 3 months ago
Sikander Saleem f3aa929cb1 view all attachments added. 3 months ago
Sikander Saleem 7445902564 chat attachment added. 3 months ago
Sikander Saleem c5b4325aec survey notification finalized. 3 months ago
Sikander Saleem 186987c5ce chat flow improvement and connect to SignalR. 3 months ago
Sikander Saleem 781e61814a survey questionare finalized. 3 months ago
Sikander Saleem 47e68b8cc3 switch to dev. 3 months ago
Sikander Saleem db1e7ea0bd 1 to 1 chat ui completed for text message, with 2 users. 3 months ago
Sikander Saleem a902204ff1 survey improvements. 3 months ago
WaseemAbbasi22 659f2029dc label changes 3 months ago
WaseemAbbasi22 a04ae0c833 attachment fixes 3 months ago
Sikander Saleem 9d7c3a38b2 chat connection improvements 3 months ago
Sikander Saleem 37ff2b4f4a APK to provided to FM with fixed tracker issues. 3 months ago
Sikander Saleem 1cc5ebd9fb survey question cont. 3 months ago
Sikander Saleem bcfa23bad3 chat message ui completed for sender and recipient. 3 months ago
Sikander Saleem 01f004cecc chat development cont. 3 months ago
Sikander Saleem 830700ce79 grey error fixed on release build. 4 months ago
Sikander Saleem ec28f8992c chat cont. 4 months ago
Sikander Saleem 12e971749e rename Oracle Code-> Name/Oracle Code 4 months ago
Sikander Saleem 233dc19030 users position added. 4 months ago
Sikander Saleem 675c1fa10b for uat 4 months ago
Sikander Saleem 5c8e1d5763 bug fixes. 4 months ago
WaseemAbbasi22 c1455378a6 bug fixes and improvements 4 months ago
Sikander Saleem 3d2e908613 traf form validation added. 4 months ago
WaseemAbbasi22 81dd189025 internal audit api's implementation in progress 4 months ago
Sikander Saleem d2665fd10f chat provider , api client added. 4 months ago
WaseemAbbasi22 81dd799672 internal audit api's implementation in progress 4 months ago
WaseemAbbasi22 a8e8774040 internal audit api's implementation in progress 4 months ago
Sikander Saleem 3b6a0eea3c voice note ui added. 4 months ago
Sikander Saleem a9ce4eac3d Merge branch 'refs/heads/design_3.0_traf_module' into design_3.0_cx_module 4 months ago
Sikander Saleem e54167b9b0 getUsersBasedOnSearch api for nurse role only. 4 months ago
Sikander Saleem 96b65e99fa chat list ui added-1. 4 months ago
Sikander Saleem 18a53d7518 chat list ui added. 4 months ago
Sikander Saleem 22a667a7b3 Merge branch 'refs/heads/design_3.0_asset_inventory_module' into design_3.0_traf_module
# Conflicts:
#	lib/controllers/api_routes/urls.dart
#	lib/controllers/providers/api/all_requests_provider.dart
#	lib/dashboard_latest/widgets/request_category_list.dart
#	lib/models/new_models/dashboard_detail.dart
#	lib/new_views/pages/land_page/my_request/my_requests_page.dart
#	lib/new_views/pages/land_page/requests/request_paginated_listview.dart
#	lib/new_views/pages/land_page/widgets/request_item_view_list.dart
4 months ago
Sikander Saleem 160dc57b86 Merge branch 'refs/heads/design_3.0_data_segregation' into design_3.0_asset_inventory_module
# Conflicts:
#	lib/controllers/api_routes/urls.dart
#	lib/controllers/providers/api/all_requests_provider.dart
4 months ago
Sikander Saleem d48fdfaaa5 Merge branch 'refs/heads/design_3.0_TM_Module_snagsFix' into design_3.0_data_segregation 4 months ago
Sikander Saleem 46fd537c3a global health ui improvements added. 4 months ago
Sikander Saleem 25475de68e Merge branch 'refs/heads/design_3.0_TM_Module' into design_3.0_TM_Module_snagsFix
# Conflicts:
#	lib/modules/pm_module/ppm_wo/ppm_details_page.dart
4 months ago
Sikander Saleem c5c0c51ecb phone number added. 4 months ago
Sikander Saleem eb70aa6e58 spelling correct. 4 months ago
Sikander Saleem ee36baaad5 transaction date added in asset detail card. 4 months ago
Sikander Saleem dccd5542bf request creation failed bug fix. 4 months ago
Sikander Saleem 3c93245e4d census q type changed from int to string. 4 months ago
Sikander Saleem 33251cfcff improvements. 4 months ago
WaseemAbbasi22 1e901e4c24 ATOMS-1374 fixes 4 months ago
WaseemAbbasi22 4438d96312 ATOMS-1356 fixes 4 months ago
Sikander Saleem d181cce56b improvements. 4 months ago
WaseemAbbasi22 09843a9625 Ui Changes 4 months ago
Sikander Saleem 78cec1c69c created date added. 4 months ago
WaseemAbbasi22 4a283a685c classification API added 4 months ago
Sikander Saleem 8c1c865759 temporary server added. 4 months ago
Sikander Saleem a763538771 temporary server added. 4 months ago
Sikander Saleem 4f2cb42a3f temporary server added. 4 months ago
WaseemAbbasi22 549e5f4fd9 ATOMS-1305 bug fixes 4 months ago
WaseemAbbasi22 cbddd807d4 internal audit design complete 4 months ago
Sikander Saleem 866ec5754e improvements 4 months ago
Sikander Saleem ea54aea1f6 1.3.11+30 uploaded on stores. 4 months ago
Sikander Saleem 985d559860 ppm update button hide for end user. & status color changed. 4 months ago
Sikander Saleem c6e66e82e8 ppm external type id changed to value. 4 months ago
Sikander Saleem b71207538d assessor dashboard api improvement. 4 months ago
Sikander Saleem a8a2d4bbbf improvement 4 months ago
Sikander Saleem 40c7e75fa4 assessor role added for TRAF. 4 months ago
Sikander Saleem ae0e08183f asset group switching added. 4 months ago
Sikander Saleem 8c45d89c3e improvements 4 months ago
Sikander Saleem 7c367ba614 Apk provided to QA. 4 months ago
Sikander Saleem 599da01554 traf request item list view added. 4 months ago
Sikander Saleem 144951caec traf request creation completed. 4 months ago
Sikander Saleem 174e714d38 nurse cannot see recall and alert. 4 months ago
Sikander Saleem dd19507fa1 add traf payload added. 4 months ago
Sikander Saleem 567be98f74 improvement. 4 months ago
Sikander Saleem 4e28068eef improvement. 4 months ago
Sikander Saleem 5d28eb6c21 ui improvement. 4 months ago
Sikander Saleem ceee6d689d total working hours added on task detail. 4 months ago
Sikander Saleem 76acdddabc asset by oracle code api added, departments lookup added. 4 months ago
Sikander Saleem b17d6db327 po number, site, information added in asset details, 4 months ago
WaseemAbbasi22 d0565a321a asset number free text field added for existing project and manual project not registered 5 months ago
WaseemAbbasi22 b6c5d7ffa3 Merge remote-tracking branch 'origin/design_3.0_asset_inventory_module' into design_3.0_asset_inventory_module 5 months ago
WaseemAbbasi22 f83109d5ca pagination fixes and 5 months ago
Sikander Saleem aae42ddb27 Apk Provided to QA, UAT v4 5 months ago
Sikander Saleem d3c000004e code improvements 5 months ago