Commit Graph

472 Commits (072f3da97e7bc946a52c82f2d9da1b39363063d3)

Author SHA1 Message Date
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
3 months ago
Sikander Saleem fbc14318e5 asset images upload functionality added for ai training. 3 months ago
Sikander Saleem 38f5f506e6 asset model updated. 4 months ago
Sikander Saleem df2c7af281 asset model asset attachment changed. 4 months ago
Sikander Saleem bdadd2fe7b Merge branch 'refs/heads/main_production_ai_enhancement' into ui_ux_rollout_merge
# Conflicts:
#	lib/modules/cm_module/views/components/service_request_detail_view.dart
#	lib/modules/incident_module/incident_detail_page.dart
#	lib/modules/traf_module/traf_request_detail_page.dart
4 months ago
Sikander Saleem 78e9042bbb incident module cm work order integrated & improvements. 4 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
4 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
4 months ago
Sikander Saleem 14371d42f2 Merge branch 'refs/heads/main_production_ai_enhancement' into cleaner_module_new_flow 4 months ago
WaseemAbbasi22 6cad1866e7 added identifier for loan creation department to match the department with cm request 4 months ago
WaseemAbbasi22 d6f2d78351 Revert "added identifier for loan request department model"
This reverts commit f2b472f4df.
4 months ago
WaseemAbbasi22 450cb91268 site deparment dropdown added for create traf request 5 months ago
WaseemAbbasi22 f2b472f4df added identifier for loan request department model 5 months ago
Sikander Saleem 7d25f2be01 UAT Improvements. 5 months ago
WaseemAbbasi22 dc893b7836 sort added for workorder filter page 5 months ago
Sikander Saleem d6e775cff1 improvements 6 months ago
Sikander Saleem b5b58ef622 improvements 6 months ago
Sikander Saleem 2b9ff5904b dashboard flow changed. 6 months ago
WaseemAbbasi22 fe104e977f added date range and sort on search page 6 months ago
WaseemAbbasi22 d3dadb70c3 improvements 6 months ago
WaseemAbbasi22 77f5d41757 export feature added for asset and my request 6 months ago
WaseemAbbasi22 33f1f07e86 housekeeping module completed 6 months ago
Sikander Saleem b09609f692 commented files/codes deleted. 7 months ago
WaseemAbbasi22 aab2a557c8 search fixes 7 months ago
Sikander Saleem 0a6fca7f63 room model changed to json. 8 months ago
Sikander Saleem 2e3736cdc9 Merge branch 'design_3.0_loan_module' into design_3.0_demo_module
# Conflicts:
#	lib/controllers/api_routes/urls.dart
#	lib/models/generic_attachment_model.dart
#	lib/modules/loan_module/pages/loan_equipment_detail_page.dart
8 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
8 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
8 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
8 months ago
Sikander Saleem 260dfbcf06 demoRequest model updated in asset model 8 months ago
Sikander Saleem 66b8ea59d9 signature added. 8 months ago
Sikander Saleem 67da263e0d loan improvements 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
9 months ago
Sikander Saleem ce873d99a5 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 cb2329a6c2 incident create request completed. 9 months ago
WaseemAbbasi22 60051af331 Merge remote-tracking branch 'origin/design_3.0_demo_module' into design_3.0_demo_module
# Conflicts:
#	lib/controllers/api_routes/urls.dart
#	lib/modules/demo_module/create_demo_request_page.dart
#	lib/modules/demo_module/demo_provider.dart
9 months ago
WaseemAbbasi22 1e158e8bd4 update form changed 9 months ago
Sikander Saleem 3372f7d38d demo attachment document type added. 9 months ago
WaseemAbbasi22 1f3c0bad97 Merge remote-tracking branch 'origin/design_3.0_loan_module' into design_3.0_loan_module
# Conflicts:
#	lib/modules/cm_module/cm_detail_page.dart
9 months ago
WaseemAbbasi22 e0ed594072 API's implemented 9 months ago
Sikander Saleem 6f43fd777a user shift information added. 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
WaseemAbbasi22 a0a084803d UI improvements 9 months ago
Sikander Saleem b78d10af46 current user employee id for chat. 9 months ago
WaseemAbbasi22 3944a549b2 requested changes done 10 months ago
WaseemAbbasi22 4f9f76515d added form design for installation and pullout, handle pullout type task and other improvements 10 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
10 months ago
WaseemAbbasi22 c2068544db Medical Gas Inspection completed 10 months ago
WaseemAbbasi22 7dd8fff34e asset delivery modules completed 10 months ago