Commit Graph

339 Commits (60511b60cfb2afd76c15df2cdbfeff5e5442fb87)

Author SHA1 Message Date
Sikander Saleem 60511b60cf files refactoring 7 months ago
Sikander Saleem 09762fd278 files refactoring 7 months ago
Sikander Saleem 1a3861d816 files refactoring 7 months ago
Sikander Saleem 16a2fa2b26 files refactoring 7 months ago
Sikander Saleem 62cc13b1c0 standard / backup loan request creation. 7 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
7 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
7 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
7 months ago
WaseemAbbasi22 542070c791 improvements 7 months ago
WaseemAbbasi22 255691f47a loan design in progress 7 months ago
Sikander Saleem 01f004cecc chat development cont. 7 months ago
WaseemAbbasi22 81dd189025 internal audit api's implementation in progress 7 months ago
WaseemAbbasi22 a8e8774040 internal audit api's implementation in progress 7 months ago
Sikander Saleem 96b65e99fa chat list ui added-1. 7 months ago
Sikander Saleem 18a53d7518 chat list ui added. 8 months ago
Sikander Saleem 22a667a7b3 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/dashboard_latest/widgets/request_category_list.dart
#	lib/models/new_models/dashboard_detail.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 160dc57b86 Merge branch 'refs/heads/design_3.0_data_segregation' into design_3.0_asset_inventory_module
# Conflicts:
#	lib/controllers/api_routes/urls.dart
#	lib/controllers/providers/api/all_requests_provider.dart
8 months ago
Sikander Saleem d48fdfaaa5 Merge branch 'refs/heads/design_3.0_TM_Module_snagsFix' into design_3.0_data_segregation 8 months ago
Sikander Saleem 46fd537c3a global health ui improvements added. 8 months ago
WaseemAbbasi22 cbddd807d4 internal audit design complete 8 months ago
Sikander Saleem 866ec5754e improvements 8 months ago
Sikander Saleem 40c7e75fa4 assessor role added for TRAF. 8 months ago
Sikander Saleem 599da01554 traf request item list view added. 8 months ago
Sikander Saleem 144951caec traf request creation completed. 8 months ago
Sikander Saleem 174e714d38 nurse cannot see recall and alert. 8 months ago
Sikander Saleem 5d28eb6c21 ui improvement. 8 months ago
Sikander Saleem ceee6d689d total working hours added on task detail. 8 months ago
Sikander Saleem b17d6db327 po number, site, information added in asset details, 8 months ago
Sikander Saleem d3c000004e code improvements 8 months ago
Sikander Saleem 56328b81b4 traf module added, create, view details, update. cont 8 months ago
WaseemAbbasi22 8578319cc3 asset inventory module ready for qa 8 months ago
WaseemAbbasi22 e5775019a4 asset inventory design 9 months ago
Sikander Saleem 89b81391e9 site contact list api added. 9 months ago
Sikander Saleem 7efeeed619 bottom sheet ui improvements,safe area added. 9 months ago
WaseemAbbasi22 ccef98860f recall and alert type request added 10 months ago
Sikander Saleem 630c1533e7 Merge branch 'refs/heads/design_3.0_TM_Module' into design_3.0_task_module_new_merge
# Conflicts:
#	lib/controllers/api_routes/urls.dart
#	lib/views/pages/user/requests/create_service_request_page.dart
#	lib/views/widgets/images/multi_image_picker.dart
10 months ago
Sikander Saleem 642d1a908c auto login improvement. 10 months ago
waseemabbasi22 6c3f36944a auth and attachment fixes 10 months ago
Sikander Saleem b2d3d60152 logout api added. 10 months ago
WaseemAbbasi22 2fab61b144 task module disabled 10 months ago
Sikander Saleem e0ad359295 system bottom navigation bar theme improvement. 10 months ago
Sikander Saleem f3539f1471 Merge branch 'refs/heads/design_3.0_TM_Module_snagsFix' into design_3.0_task_module_new_merge 10 months ago
Sikander Saleem a479a23790 Merge branch 'refs/heads/design_3.0_TM_Module_snagsFix' into design_3.0_TM_Module 10 months ago
Sikander Saleem e3a97c0ae9 enable engineer time picker issue fixed, session expired dialog issue fixed. 10 months ago
Sikander Saleem 47673e3473 Merge branch 'refs/heads/design_3.0_TM_Module_snagsFix' into design_3.0_task_module_new_merge
# Conflicts:
#	lib/modules/cm_module/views/components/action_button/footer_action_button.dart
#	lib/modules/cm_module/views/components/service_request_detail_view.dart
#	lib/modules/cm_module/views/forms/work_order/components/attachments_view.dart
#	lib/modules/tm_module/tasks_wo/update_task_request_view.dart
#	lib/views/pages/user/gas_refill/update_gas_refill_request.dart
#	lib/views/widgets/images/multi_image_picker.dart
10 months ago
Sikander Saleem 89865c0ddd Merge branch 'refs/heads/design_3.0_dark_mode' into design_3.0_TM_Module_attachmentFix
# Conflicts:
#	lib/modules/cm_module/views/forms/asset_retired/verify_asset_detail.dart
#	lib/modules/cm_module/views/forms/cost/cost_detail_form_screen.dart
#	lib/modules/pm_module/ppm_wo/update_ppm/ppm_calibration_tools_form.dart
#	lib/views/pages/device_transfer/update_device_transfer.dart
10 months ago
WaseemAbbasi22 4e665d1959 attachment fixes 10 months ago
WaseemAbbasi22 7ecccf8bf8 improvements 10 months ago
WaseemAbbasi22 6d39b20e0b dark mode implementation 11 months ago
Sikander Saleem aa1d75de07 merge conflict resolved. 11 months ago