Commit Graph

130 Commits (facf80b07ec8fc3476d2a6f934203bb6b769efc8)

Author SHA1 Message Date
Sikander Saleem facf80b07e Merge branch 'refs/heads/design_3.0_traf_module' into design_3.0_GlobalHealth
# 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
1 week ago
Sikander Saleem a39d8297a6 Merge branch 'refs/heads/design_3.0_asset_inventory_module' into design_3.0_GlobalHealth
# Conflicts:
#	lib/controllers/api_routes/urls.dart
#	lib/controllers/providers/api/all_requests_provider.dart
1 week ago
Sikander Saleem 9cef8782d0 Merge branch 'refs/heads/design_3.0_TM_Module' into design_3.0_task_module_new_merge
# Conflicts:
#	lib/modules/pm_module/ppm_wo/ppm_details_page.dart
1 week ago
WaseemAbbasi22 549e5f4fd9 ATOMS-1305 bug fixes 1 week ago
Sikander Saleem 866ec5754e improvements 1 week ago
Sikander Saleem 985d559860 ppm update button hide for end user. & status color changed. 2 weeks ago
Sikander Saleem c6e66e82e8 ppm external type id changed to value. 2 weeks ago
Sikander Saleem b71207538d assessor dashboard api improvement. 2 weeks ago
Sikander Saleem 8c45d89c3e improvements 2 weeks ago
Sikander Saleem 599da01554 traf request item list view added. 2 weeks ago
Sikander Saleem 144951caec traf request creation completed. 2 weeks ago
Sikander Saleem dd19507fa1 add traf payload added. 2 weeks ago
Sikander Saleem 567be98f74 improvement. 3 weeks ago
Sikander Saleem ceee6d689d total working hours added on task detail. 3 weeks ago
Sikander Saleem 76acdddabc asset by oracle code api added, departments lookup added. 3 weeks ago
Sikander Saleem b17d6db327 po number, site, information added in asset details, 3 weeks ago
WaseemAbbasi22 d0565a321a asset number free text field added for existing project and manual project not registered 3 weeks ago
WaseemAbbasi22 f83109d5ca pagination fixes and 3 weeks ago
Sikander Saleem d3c000004e code improvements 3 weeks ago
Sikander Saleem 56328b81b4 traf module added, create, view details, update. cont 3 weeks ago
WaseemAbbasi22 8578319cc3 asset inventory module ready for qa 3 weeks ago
WaseemAbbasi22 c19fdb173b api integrated for main views 4 weeks ago
Sikander Saleem f9b101c233 improvement. 4 weeks ago
Sikander Saleem dfef9aadb7 Merge branch 'refs/heads/design_3.0_task_module_new_merge' into design_3.0_asset_inventory_module 4 weeks ago
WaseemAbbasi22 e5775019a4 asset inventory design 4 weeks ago
Sikander Saleem 4d035e9c46 android AGP upgraded & enhancement. 1 month ago
Sikander Saleem 88f64e2297 comment bug fixed, on time picker. 1 month ago
Sikander Saleem ee70ca3c2b Merge remote-tracking branch 'origin/design_3.0_task_module_new_merge' into design_3.0_task_module_new_merge 1 month ago
Sikander Saleem 0efc166a69 total working hour parameter changed. 1 month ago
WaseemAbbasi22 423968d7f6 timer history added 1 month ago
Sikander Saleem 89b81391e9 site contact list api added. 1 month ago
WaseemAbbasi22 4d2931e335 Recall and Alert payload fixes 1 month ago
WaseemAbbasi22 f991456d17 Recall and Alert Fixes 1 month ago
Sikander Saleem 94d57685cd task module toJson model changed, duplicate timer activity fixed. 1 month ago
WaseemAbbasi22 e40d9a1138 ATOMS-1025, ATOMS-937 and some color fixes for dark mode 2 months ago
Sikander Saleem fad81a84ba 1.3.10+29 uploaded. 2 months ago
Sikander Saleem 0604dd6d69 improvements. 2 months ago
Sikander Saleem 328b2fe48d for edd date limitation increased 1 year. 2 months ago
WaseemAbbasi22 b45035a35f Merge remote-tracking branch 'origin/design_3.0_task_module_new_merge' into design_3.0_task_module_new_merge 2 months ago
WaseemAbbasi22 bbc4974458 task attachment fixes 2 months ago
Sikander Saleem df66cf5c77 improvements 2 months ago
Sikander Saleem b7aefbe7f3 task contact info in detail view, & improvements 2 months ago
WaseemAbbasi22 9a332e86e2 Merge branch 'design_3.0_TM_Module' into design_3.0_task_module_new_merge
# Conflicts:
#	lib/controllers/api_routes/urls.dart
#	lib/views/widgets/fullscreen_dialogs/selection_fullscreen_dialog.dart
2 months ago
WaseemAbbasi22 ccef98860f recall and alert type request added 2 months ago
Sikander Saleem c1a7562e3b create asset transfer, on internal & external destination values reset. 2 months ago
WaseemAbbasi22 5e3b09315f dark mode color fixes 2 months ago
Sikander Saleem e0ad359295 system bottom navigation bar theme improvement. 2 months ago
Sikander Saleem c4efbba6a8 ui fixes 3 months ago
Sikander Saleem 1edcea47be 1.3.6+25 merge conflict resolved. 3 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
3 months ago