Commit Graph

230 Commits (d57348dd92fb3c32392f4593f542736d0c96176c)

Author SHA1 Message Date
WaseemAbbasi22 d57348dd92 bug fixes for site and department previously it was showing all sites not related to that specif user 2 weeks ago
WaseemAbbasi22 66b77c51a6 loan site bug fixes 2 weeks 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
4 weeks ago
Sikander Saleem b3f8dabf2f Merge branch 'refs/heads/design_3.0_internal_audit_module' into design_3.0_cx_module 4 weeks ago
Sikander Saleem 2b274f1f83 bug 1518 fixed. 4 weeks ago
Sikander Saleem 17210195db uat improvements. md->department, enable recall and alert for quality user. 4 weeks ago
Sikander Saleem 883210e61b merge conflict fixed 1 month 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
1 month 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
1 month ago
Sikander Saleem e1efd59252 request no, md and site details, remove item if no finding selected and dashboard api added for quality user. 1 month ago
Sikander Saleem f2ebadf1b7 attachment list view added in files list widget. 1 month ago
Sikander Saleem 4763132302 attachment as listview added. 1 month ago
Sikander Saleem bf2b777f8d chat improvements. 1 month ago
Sikander Saleem 5ff9fc5808 chat added gas refill, transfer asset internal & external, task request. 1 month ago
Sikander Saleem a9362d90f5 asset information auto fetch from CM workOrder. 1 month ago
Sikander Saleem 30bf847e6e department dropdown return first index item fixed. 1 month ago
Sikander Saleem f0c003e6fa disabled loan type dropdown added. 1 month ago
Sikander Saleem 0a9dd86ce0 improvements. 1 month ago
Sikander Saleem b407103002 Merge branch 'refs/heads/design_3.0_cx_module' into design_3.0_loan_module 1 month 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
1 month 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
1 month 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
1 month ago
Sikander Saleem 16d5eb32b9 assign fe user model updated. 2 months ago
Sikander Saleem 5d2291a30f loan option for in progress requests. 2 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
2 months ago
Sikander Saleem 8e29c84c70 loan improvements. 2 months ago
waseemabbasi22 2962f248e0 timer fixes 2 months ago
Sikander Saleem 07ec866315 loan attachment added & improvements. 2 months ago
Sikander Saleem e7e0f7375c chat fix when contact persons list is empty. 2 months ago
Sikander Saleem ff7ee7f8bb user module permission api added. asset inventory switch to user permissions. 2 months ago
Sikander Saleem 22fd3c8cc9 loan equipment item view added; 2 months ago
Sikander Saleem e76067bdac LoanTypeId param added. 2 months ago
Sikander Saleem 60511b60cf files refactoring 2 months ago
Sikander Saleem 09762fd278 files refactoring 2 months ago
Sikander Saleem 1a3861d816 files refactoring 2 months ago
Sikander Saleem 16a2fa2b26 files refactoring 2 months ago
Sikander Saleem 62cc13b1c0 standard / backup loan request creation. 2 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
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
2 months ago
waseemabbasi22 b4943aff3d initial test done 2 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
2 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
2 months ago
Sikander Saleem 60125bb6d9 Merge branch 'refs/heads/design_3.0_traf_module' into design_3.0_internal_audit_module 2 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
2 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
2 months ago
waseemabbasi22 c02fc2f1b1 api integration inprogress 2 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
2 months ago
Sikander Saleem bbeabda38d parameter added for push notifications. 2 months ago
waseemabbasi22 0ffc0f650f improvements 2 months ago
waseemabbasi22 c4160ff98b improvements 2 months ago