Commit Graph

482 Commits (267a4445d1925dcbe7d751fefe1e71bc747ffa4b)

Author SHA1 Message Date
Sikander Saleem 267a4445d1 ui improvements 8 months ago
Sikander Saleem 9dc19354a2 hide loan for release 8 months ago
Sikander Saleem f6a433ca09 Merge branch 'design_3.0_asset_delivery_module' into design_3.0_medical_gas
# Conflicts:
#	lib/controllers/api_routes/urls.dart
8 months ago
WaseemAbbasi22 bf4d2a3257 Merge remote-tracking branch 'origin/design_3.0_asset_delivery_module' into design_3.0_asset_delivery_module 9 months ago
WaseemAbbasi22 0908cda2b0 Ui improvement and delivery inspection new apis implemented 9 months ago
Sikander Saleem 178309eb1e Merge branch 'design_3.0_asset_delivery_module' into design_3.0_medical_gas
# Conflicts:
#	lib/controllers/api_routes/urls.dart
#	lib/main.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
9 months ago
Sikander Saleem da85a2b639 Merge branch 'design_3.0_loan_module' into design_3.0_asset_delivery_module
# Conflicts:
#	lib/controllers/api_routes/urls.dart
9 months ago
Sikander Saleem 48b4b5e368 Merge branch 'design_3.0_cx_module' into design_3.0_loan_module
# Conflicts:
#	lib/controllers/notification/firebase_notification_manger.dart
#	lib/modules/cm_module/cm_detail_page.dart
#	lib/modules/cx_module/chat/chat_widget.dart
#	lib/new_views/pages/land_page/create_request_type_bottom_sheet.dart
#	lib/new_views/pages/land_page/requests/service_request_item_view.dart
#	lib/views/pages/user/requests/pending_requests_screen.dart
9 months ago
Sikander Saleem 520e7af640 fcm initialization changed to landing page 9 months ago
WaseemAbbasi22 73ee12cba4 Atoms-1743,1745,1748 fixes 9 months ago
WaseemAbbasi22 3c9688fdcb delivery notes item design updated 9 months ago
WaseemAbbasi22 3944a549b2 requested changes done 9 months ago
Sikander Saleem 45d736a64e app release v1.5.0+32 to stores 9 months ago
WaseemAbbasi22 2425c78cf9 chat count implemented 9 months ago
Sikander Saleem 9f670d4a0b Merge branch 'refs/heads/design_3.0_loan_module' into design_3.0_asset_delivery_module
# Conflicts:
#	lib/controllers/api_routes/urls.dart
9 months ago
WaseemAbbasi22 c2068544db Medical Gas Inspection completed 9 months ago
WaseemAbbasi22 7dd8fff34e asset delivery modules completed 10 months ago
Sikander Saleem 6d20e6f307 chat enable for cm module when engineer assigned. 10 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
10 months ago
Sikander Saleem b3f8dabf2f Merge branch 'refs/heads/design_3.0_internal_audit_module' into design_3.0_cx_module 10 months ago
Sikander Saleem 17210195db uat improvements. md->department, enable recall and alert for quality user. 10 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
10 months ago
Sikander Saleem 5ff9fc5808 chat added gas refill, transfer asset internal & external, task request. 10 months ago
WaseemAbbasi22 789522b79b asset delivery modules design flow completed 10 months ago
Sikander Saleem b407103002 Merge branch 'refs/heads/design_3.0_cx_module' into design_3.0_loan_module 10 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
10 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
10 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
10 months ago
Sikander Saleem 07ec866315 loan attachment added & improvements. 10 months ago
Sikander Saleem ff7ee7f8bb user module permission api added. asset inventory switch to user permissions. 10 months ago
Sikander Saleem 22fd3c8cc9 loan equipment item view added; 10 months ago
Sikander Saleem 60511b60cf files refactoring 11 months ago
Sikander Saleem 09762fd278 files refactoring 11 months ago
Sikander Saleem 1a3861d816 files refactoring 11 months ago
Sikander Saleem 16a2fa2b26 files refactoring 11 months ago
Sikander Saleem 62cc13b1c0 standard / backup loan request creation. 11 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
11 months ago
waseemabbasi22 b4943aff3d initial test done 11 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
11 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
11 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
11 months ago
WaseemAbbasi22 542070c791 improvements 11 months ago
WaseemAbbasi22 255691f47a loan design in progress 11 months ago
Sikander Saleem a902204ff1 survey improvements. 11 months ago
Sikander Saleem 01f004cecc chat development cont. 11 months ago
Sikander Saleem 830700ce79 grey error fixed on release build. 11 months ago
WaseemAbbasi22 81dd189025 internal audit api's implementation in progress 11 months ago
WaseemAbbasi22 a8e8774040 internal audit api's implementation in progress 11 months ago
Sikander Saleem 96b65e99fa chat list ui added-1. 11 months ago
Sikander Saleem 18a53d7518 chat list ui added. 11 months ago