Commit Graph

171 Commits (d7c8d9f3cf97e985071dce9ede3ec1d44bc5ecc2)

Author SHA1 Message Date
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 months ago
WaseemAbbasi22 5137f2dd34 bug fixes 3 months ago
WaseemAbbasi22 7186fb13c0 improvements 3 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
WaseemAbbasi22 f116c96578 site , signup and demo completed 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
WaseemAbbasi22 7fc19d9058 added the site and department dropdown 4 months ago
WaseemAbbasi22 450cb91268 site deparment dropdown added for create traf request 4 months ago
WaseemAbbasi22 d9eb1ae835 site implementation inprogress 4 months ago
WaseemAbbasi22 3109e87cee inprogress 4 months ago
WaseemAbbasi22 14e845b18a signup inprogress 4 months ago
WaseemAbbasi22 c35162fd88 cleaner module implementation new flow complete 4 months ago
Sikander Saleem f356d5efcd improvements. 5 months ago
WaseemAbbasi22 77f5d41757 export feature added for asset and my request 5 months ago
WaseemAbbasi22 33f1f07e86 housekeeping module completed 5 months ago
Sikander Saleem b3ec1f0a63 code enhancement with ai. 6 months ago
Sikander Saleem b09609f692 commented files/codes deleted. 6 months ago
Sikander Saleem b94d5d1fbd android sdk upgraded to 36, 16kb page size support added. 7 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
7 months ago
Sikander Saleem 0a06edd883 improvements 8 months ago
Sikander Saleem cb2329a6c2 incident create request completed. 8 months ago
Sikander Saleem 58ee00b00a incident module dev -1 8 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
8 months ago
Sikander Saleem 3372f7d38d demo attachment document type added. 8 months ago
WaseemAbbasi22 e0ed594072 API's implemented 8 months ago
WaseemAbbasi22 56252716b3 Merge remote-tracking branch 'origin/design_3.0_demo_module' into design_3.0_demo_module 9 months ago
Sikander Saleem 9eaae96c84 Merge branch 'design_3.0_medical_gas' into design_3.0_demo_module
# Conflicts:
#	lib/controllers/api_routes/urls.dart
#	lib/main.dart
#	lib/modules/medical_gas_inspection/create_medical_gas_request_page.dart
#	lib/modules/medical_gas_inspection/medical_gas_inspection_detail_page.dart
#	lib/new_views/pages/land_page/create_request_type_bottom_sheet.dart
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
WaseemAbbasi22 bff132ec6b API implementation inprogress 9 months ago
Sikander Saleem 7a5db103e0 api integrate cont. 9 months ago
WaseemAbbasi22 3944a549b2 requested changes done 9 months ago
WaseemAbbasi22 c2068544db Medical Gas Inspection completed 9 months ago
Sikander Saleem 6d6be40b9e chat notification redirection added. 9 months ago
Sikander Saleem a103eae1c1 demo module ui cont. 10 months ago
WaseemAbbasi22 7dd8fff34e asset delivery modules completed 10 months ago
Sikander Saleem d765bf0b83 medical gas cont. 10 months ago
Sikander Saleem 60511b60cf files refactoring 10 months ago
Sikander Saleem 09762fd278 files refactoring 10 months ago
Sikander Saleem 1a3861d816 files refactoring 10 months ago
Sikander Saleem 16a2fa2b26 files refactoring 10 months ago
Sikander Saleem 62cc13b1c0 standard / backup loan request creation. 11 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
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 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
11 months ago
waseemabbasi22 0ffc0f650f improvements 11 months ago
waseemabbasi22 c4160ff98b improvements 11 months ago