Commit Graph

73 Commits (0a9dd86ce0e4e8015f587c71554cbc2faa0e2eee)

Author SHA1 Message Date
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
2 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
2 months ago
Sikander Saleem ff7ee7f8bb user module permission api added. asset inventory switch to user permissions. 2 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 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 542070c791 improvements 3 months ago
WaseemAbbasi22 a8e8774040 internal audit api's implementation in progress 3 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
3 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
3 months ago
WaseemAbbasi22 cbddd807d4 internal audit design complete 4 months ago
Sikander Saleem 40c7e75fa4 assessor role added for TRAF. 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 5d28eb6c21 ui improvement. 4 months ago
Sikander Saleem ceee6d689d total working hours added on task detail. 4 months ago
Sikander Saleem b17d6db327 po number, site, information added in asset details, 4 months ago
Sikander Saleem d3c000004e code improvements 4 months ago
WaseemAbbasi22 e5775019a4 asset inventory design 4 months ago
Sikander Saleem 7efeeed619 bottom sheet ui improvements,safe area added. 5 months ago
WaseemAbbasi22 ccef98860f recall and alert type request added 5 months ago
WaseemAbbasi22 2fab61b144 task module disabled 6 months ago
WaseemAbbasi22 8b76629448 requestlist changes to model for status fixes 7 months ago
Sikander Saleem e9efca620d enable task module. 7 months ago
Sikander Saleem b4587a6347 hide task module & recurrent WO for nurse 9 months ago
WaseemAbbasi22 7b57ca54c3 renaming done as per pdf shared 9 months ago
WaseemAbbasi22 a42466b578 ATOMS-771, ATOMS-804, ATOMS-773, ATOMS-769, ATOMS-776, ATOMS-794, ATOMS-801, ATOMS-796, ATOMS-790, ATOMS-797, ATOMS-799, ATOMS-811, ATOMS-811, ATOMS-817, ATOMS-814, ATOMS-820, ATOMS-829, issues fixed 9 months ago
Sikander Saleem b8f6473378 UAt apk provided To QA. 10 months ago
Sikander Saleem e0902eddf7 Merge branch 'refs/heads/demo_branch' into design_3.0_tm_module_task_flow
# Conflicts:
#	lib/controllers/api_routes/urls.dart
#	lib/extensions/widget_extensions.dart
#	lib/l10n/app_ar.arb
#	lib/l10n/app_en.arb
#	lib/new_views/pages/land_page/create_request-type_bottomsheet.dart
#	lib/new_views/pages/new_gas_refill_request_page.dart
#	lib/views/pages/user/gas_refill/request_gas_refill.dart
#	lib/views/widgets/equipment/asset_picker.dart
10 months ago
WaseemAbbasi22 0fdbe8722e task request item view api integrated 10 months ago
Sikander Saleem f043c6ff6c point 8 fixed, 10 months ago
Sikander Saleem 99ef704913 rename points done 11 months ago
WaseemAbbasi22 54db7c97fc Task Request nurse side ui completed 11 months ago
Sikander Saleem 86aeddc6c2 Merge remote-tracking branch 'origin/design_3.0_ppm_new_flow' into design_3.0_ppm_new_flow 12 months ago
WaseemAbbasi22 b67e6dea11 Recurrent Work Order Complete ready to test 12 months ago
Sikander Saleem 58fb4b3829 cm feedback points, 12 months ago
WaseemAbbasi22 99bcae1dc2 recurrent task api integrated 1 year ago
Sikander Saleem e878881e5a request confirmation improvements. 1 year ago
WaseemAbbasi22 9072df77c3 improvements 1 year ago
WaseemAbbasi22 da664e957b implement changes mentioned in testing document 1 year ago
Sikander Saleem e6e35ab1d0 null safety conversion complete. 1 year ago
Sikander Saleem fe8ac14e46 sdk upgrade changes-1. 1 year ago
Muhammad Abbasi 246bb1fb55 pagination added 1 year ago
Muhammad Abbasi ad1a01b7c6 initial commit 1 year ago
Sikander Saleem 40fe6ec192 archived data filter added. 2 years ago
Sikander Saleem d50f711aec archived cont. 2 years ago
Sikander Saleem 9101783703 device transfer added in filters 2 years ago
Sikander Saleem 35b0a00ffd all requests screen, wrong data show while switching tabs fixed. 2 years ago
nextwo e42aa6205f reset button 2 years ago
Sikander Saleem eeaa9bef85 improvements. 2 years ago