Commit Graph

47 Commits (20b362142c7e84355114900abf0a66f11e95e9ca)

Author SHA1 Message Date
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
2 months ago
Sikander Saleem b78d10af46 current user employee id for chat. 2 months ago
Sikander Saleem 45d736a64e app release v1.5.0+32 to stores 3 months ago
Sikander Saleem 6d6be40b9e chat notification redirection added. 3 months ago
Sikander Saleem 883210e61b merge conflict fixed 4 months ago
Sikander Saleem ea05e965d5 Merge branch 'refs/heads/design_3.0_cx_module' into design_3.0_loan_module
# Conflicts:
#	lib/modules/tm_module/device_transfer/device_transfer_details.dart
#	lib/views/widgets/gas_refill/gas_refill_list.dart
4 months ago
Sikander Saleem bf2b777f8d chat improvements. 4 months ago
Sikander Saleem 5ff9fc5808 chat added gas refill, transfer asset internal & external, task request. 4 months ago
Sikander Saleem 09762fd278 files refactoring 4 months ago
Sikander Saleem 1a3861d816 files refactoring 4 months ago
Sikander Saleem 16a2fa2b26 files refactoring 4 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
4 months ago
WaseemAbbasi22 81dd189025 internal audit api's implementation in progress 5 months ago
Sikander Saleem 567be98f74 improvement. 6 months ago
Sikander Saleem ceee6d689d total working hours added on task detail. 6 months ago
Sikander Saleem b17d6db327 po number, site, information added in asset details, 6 months ago
Sikander Saleem 88f64e2297 comment bug fixed, on time picker. 6 months ago
Sikander Saleem ee70ca3c2b Merge remote-tracking branch 'origin/design_3.0_task_module_new_merge' into design_3.0_task_module_new_merge 6 months ago
WaseemAbbasi22 423968d7f6 timer history added 6 months ago
Sikander Saleem 89b81391e9 site contact list api added. 6 months ago
WaseemAbbasi22 4d2931e335 Recall and Alert payload fixes 6 months ago
WaseemAbbasi22 f991456d17 Recall and Alert Fixes 6 months ago
Sikander Saleem 94d57685cd task module toJson model changed, duplicate timer activity fixed. 6 months ago
WaseemAbbasi22 e40d9a1138 ATOMS-1025, ATOMS-937 and some color fixes for dark mode 7 months ago
WaseemAbbasi22 bbc4974458 task attachment fixes 7 months ago
Sikander Saleem b7aefbe7f3 task contact info in detail view, & improvements 7 months ago
WaseemAbbasi22 ccef98860f recall and alert type request added 7 months ago
WaseemAbbasi22 5e3b09315f dark mode color fixes 7 months ago
Sikander Saleem c4efbba6a8 ui fixes 7 months ago
Sikander Saleem 1edcea47be 1.3.6+25 merge conflict resolved. 8 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
8 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
8 months ago
WaseemAbbasi22 4e665d1959 attachment fixes 8 months ago
WaseemAbbasi22 6d39b20e0b dark mode implementation 8 months ago
Sikander Saleem ca1ff5892e Merge branch 'refs/heads/design_3.0_TM_Module' into design_3.0_task_module_new_merge
# Conflicts:
#	lib/modules/cm_module/service_request_detail_provider.dart
#	lib/new_views/pages/land_page/land_page.dart
#	lib/views/pages/device_transfer/update_device_transfer.dart
8 months ago
WaseemAbbasi22 32627bbda1 form fixes 8 months ago
WaseemAbbasi22 621ca230f5 Bug 904 fixes and add validation for assist employee start and end date in maintenance request 9 months ago
Sikander Saleem a626934b78 merge improvement 9 months ago
Sikander Saleem 469cffd0c8 Merge remote-tracking branch 'origin/design_3.0_task_module_new' into design_3.0_task_module_new
# Conflicts:
#	lib/modules/tm_module/tasks_wo/task_request_detail_view.dart
#	lib/modules/tm_module/tasks_wo/update_task_request_view.dart
9 months ago
Sikander Saleem c92aae9048 improvements 9 months ago
WaseemAbbasi22 ac45e20711 Bug 931, 934 fixed 9 months ago
WaseemAbbasi22 116855878b task timer issue fixed 9 months ago
Sikander Saleem bf44e5cbec verification method issue fixed, if requester not confirms arrival. 9 months ago
Sikander Saleem 616ce9b630 timer picker end date selection fixed. 9 months ago
Sikander Saleem 62dd395a73 timer picker added, and code improvements 9 months ago
WaseemAbbasi22 4d15dc9dab mark as complete confirmation dialog and new timer added for all type of requests 10 months ago
Sikander Saleem 5169894dc4 code restructured and improvements. 11 months ago