Commit Graph

407 Commits (d63f7d8939b3cba6c757c5c4449780480149b66c)

Author SHA1 Message Date
WaseemAbbasi22 7f4a06b0db PM activity and cost flow implemented 1 week ago
Sikander Saleem f62f5c9db7 Merge branch 'refs/heads/main_production' into export_module_ui_ux_enhancement_signup
# Conflicts:
#	lib/extensions/context_extension.dart
#	lib/main.dart
#	lib/new_views/common_widgets/default_app_bar.dart
2 weeks ago
Sikander Saleem 7046e1b4cf Merge branch 'refs/heads/export_module_ui_ux_enhancement' into export_module_ui_ux_enhancement_signup 4 weeks ago
Sikander Saleem 8d45b02614 Merge branch 'refs/heads/main_production_ai_enhancement' into ui_ux_rollout_merge
# Conflicts:
#	lib/controllers/api_routes/urls.dart
#	lib/modules/cm_module/views/components/service_request_detail_view.dart
#	lib/views/widgets/dialogs/loading_dialog.dart
#	lib/views/widgets/equipment/asset_detail_page.dart
#	lib/views/widgets/equipment/asset_item_gridview.dart
#	lib/views/widgets/equipment/asset_item_listview.dart
#	lib/views/widgets/equipment/single_device_picker.dart
#	pubspec.yaml
1 month ago
Sikander Saleem e9096b0ebe improvement 1 month ago
Sikander Saleem fbc14318e5 asset images upload functionality added for ai training. 1 month ago
Sikander Saleem ace00bfa85 asset images upload for ai training. 1 month ago
Sikander Saleem 3807375439 Merge branch 'refs/heads/export_module_ui_ux_enhancement' into ui_ux_rollout_merge 1 month ago
Sikander Saleem 15187d30f4 ui improvements 2 months ago
WaseemAbbasi22 fb6dc22c05 delete account apis implemented 2 months ago
Sikander Saleem 2a49a0dbcb bug 2004, sorting fixed with dashboard multi filter. 2 months ago
Sikander Saleem d136fd990e Merge branch 'refs/heads/main_production_ai_enhancement_rollout_changes' into ui_ux_rollout_merge
# Conflicts:
#	lib/controllers/api_routes/urls.dart
#	lib/dashboard_latest/widgets/progress_fragment.dart
#	lib/dashboard_latest/widgets/request_category_fragment.dart
#	lib/models/new_models/dashboard_count.dart
#	lib/modules/cleaner_module/pages/cleaner_request_item_view.dart
#	lib/modules/cleaner_module/pages/cleaner_search_form_view.dart
#	lib/modules/cleaner_module/widgets/cleaner_checklist_widget.dart
#	lib/modules/pm_module/recurrent_wo/components/task_info_widget.dart
#	lib/modules/pm_module/recurrent_wo/recurrent_work_order_view.dart
#	lib/modules/tm_module/device_transfer/device_filter_screen.dart
#	lib/modules/traf_module/traf_request_detail_page.dart
#	lib/modules/traf_module/traf_request_item_view.dart
#	lib/new_views/pages/land_page/create_request_type_bottom_sheet.dart
#	lib/new_views/pages/land_page/requests/recurrent_wo_item_view.dart
#	lib/new_views/pages/land_page/widgets/request_item_view_list.dart
2 months ago
Sikander Saleem 7aa6637cba dashboard multiple filters added. 2 months ago
Sikander Saleem 9574937596 Merge branch 'refs/heads/main_production_ai_enhancement' into main_production_ai_enhancement_rollout_changes
# Conflicts:
#	lib/controllers/api_routes/urls.dart
#	lib/controllers/providers/api/all_requests_provider.dart
2 months ago
Sikander Saleem 891a679518 traf code switch to permission api. 2 months ago
WaseemAbbasi22 f66804b38a changed the Traf name to Assessment of Need & Technology and fix department selection issue 2 months ago
WaseemAbbasi22 0c5c8d05d0 improvements 2 months ago
WaseemAbbasi22 450cb91268 site deparment dropdown added for create traf request 2 months ago
WaseemAbbasi22 fe104e977f added date range and sort on search page 3 months ago
WaseemAbbasi22 d3dadb70c3 improvements 4 months ago
Sikander Saleem d1a94df33d improvements. 4 months ago
Sikander Saleem b09609f692 commented files/codes deleted. 4 months ago
WaseemAbbasi22 aab2a557c8 search fixes 5 months ago
Sikander Saleem b94d5d1fbd android sdk upgraded to 36, 16kb page size support added. 6 months ago
Sikander Saleem 86c530dc45 improvements 6 months ago
Sikander Saleem 188df51ce3 spare cost added on cm detail 6 months ago
Sikander Saleem 65c0566eef Merge branch 'design_3.0_incident_module' into design_3.0_demo_module
# Conflicts:
#	lib/controllers/api_routes/urls.dart
#	lib/main.dart
#	lib/new_views/common_widgets/single_item_drop_down_menu.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
#	lib/new_views/pages/land_page/requests/request_paginated_listview.dart
#	lib/new_views/pages/land_page/widgets/request_item_view_list.dart
6 months ago
Sikander Saleem 619c643367 Merge branch 'refs/heads/design_3.0_eng_role_module' into design_3.0_demo_module 6 months ago
Sikander Saleem 71dfcde5a1 Merge branch 'refs/heads/design_3.0_rota_module' into design_3.0_demo_module
# Conflicts:
#	lib/controllers/api_routes/urls.dart
6 months ago
Sikander Saleem 64fbf46b82 Merge branch 'refs/heads/design_3.0_medical_gas' into design_3.0_demo_module
# Conflicts:
#	lib/controllers/api_routes/urls.dart
#	lib/modules/loan_module/pages/loan_equipment_detail_page.dart
#	lib/new_views/pages/land_page/create_request_type_bottom_sheet.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
6 months ago
Sikander Saleem 31a9296a8e improvements 6 months ago
Sikander Saleem 6cf051e66e incident detail page addded. 6 months ago
Sikander Saleem 8db4094716 assign to me & cancel added for asset transfer. 7 months ago
Sikander Saleem b14130e6c7 Merge branch 'design_3.0_rota_module' into design_3.0_eng_role_module
# Conflicts:
#	lib/views/pages/user/profile_page.dart
7 months ago
Sikander Saleem d993a22b39 monthly calender added for rota 7 months ago
Sikander Saleem 0f4a409780 assign to me added ion gas refill and tasks 7 months ago
WaseemAbbasi22 1e158e8bd4 update form changed 7 months ago
WaseemAbbasi22 0908cda2b0 Ui improvement and delivery inspection new apis implemented 7 months ago
Sikander Saleem c377c67f40 rota module added. 7 months ago
Sikander Saleem 6f43fd777a user shift information added. 7 months ago
WaseemAbbasi22 3944a549b2 requested changes done 7 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
8 months ago
WaseemAbbasi22 7dd8fff34e asset delivery modules completed 8 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
8 months ago
Sikander Saleem b3f8dabf2f Merge branch 'refs/heads/design_3.0_internal_audit_module' into design_3.0_cx_module 8 months ago
Sikander Saleem 17210195db uat improvements. md->department, enable recall and alert for quality user. 8 months ago
Sikander Saleem b407103002 Merge branch 'refs/heads/design_3.0_cx_module' into design_3.0_loan_module 9 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
9 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
9 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
9 months ago