Commit Graph

125 Commits (9f670d4a0b0a721823e2c168ce1a3513d8136467)

Author SHA1 Message Date
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
2 months ago
WaseemAbbasi22 7dd8fff34e asset delivery modules completed 2 months ago
Sikander Saleem 5ff9fc5808 chat added gas refill, transfer asset internal & external, task request. 3 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
3 months ago
Sikander Saleem 9d7c3a38b2 chat connection improvements 4 months ago
Sikander Saleem 233dc19030 users position added. 4 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
4 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
4 months ago
Sikander Saleem 599da01554 traf request item list view added. 5 months ago
Sikander Saleem 144951caec traf request creation completed. 5 months ago
Sikander Saleem 76acdddabc asset by oracle code api added, departments lookup added. 5 months ago
Sikander Saleem b17d6db327 po number, site, information added in asset details, 5 months ago
WaseemAbbasi22 f83109d5ca pagination fixes and 5 months ago
WaseemAbbasi22 8578319cc3 asset inventory module ready for qa 5 months ago
WaseemAbbasi22 c19fdb173b api integrated for main views 5 months ago
Sikander Saleem 0efc166a69 total working hour parameter changed. 5 months ago
Sikander Saleem 89b81391e9 site contact list api added. 5 months ago
WaseemAbbasi22 4d2931e335 Recall and Alert payload fixes 5 months ago
WaseemAbbasi22 f991456d17 Recall and Alert Fixes 5 months ago
Sikander Saleem 94d57685cd task module toJson model changed, duplicate timer activity fixed. 5 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
6 months ago
Sikander Saleem bb0a031104 1.3.9+28 uploaded. 6 months ago
WaseemAbbasi22 ccef98860f recall and alert type request added 6 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
7 months ago
WaseemAbbasi22 8d02ff5ec1 mr number and exchange cost added 7 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
7 months ago
WaseemAbbasi22 1285ae68ec multiple assistant employee structure added 7 months ago
WaseemAbbasi22 705dff245d multiple assistant employee structure added 7 months ago
Sikander Saleem ffbe58b6c6 Merge remote-tracking branch 'origin/design_3.0_TM_Module_snagsFix' into design_3.0_TM_Module_snagsFix 7 months ago
WaseemAbbasi22 32627bbda1 form fixes 7 months ago
Sikander Saleem 95ab0192fe edd and cm frame improvements 7 months ago
WaseemAbbasi22 621ca230f5 Bug 904 fixes and add validation for assist employee start and end date in maintenance request 8 months ago
Sikander Saleem a626934b78 merge improvement 8 months ago
WaseemAbbasi22 ac45e20711 Bug 931, 934 fixed 8 months ago
Sikander Saleem a2e5a8a588 otp verification improved, serial no added 8 months ago
Sikander Saleem 62dd395a73 timer picker added, and code improvements 8 months ago
WaseemAbbasi22 4d15dc9dab mark as complete confirmation dialog and new timer added for all type of requests 9 months ago
WaseemAbbasi22 1e5c43d02e cost parameters and activity assign user check added. 9 months ago
Sikander Saleem e26db46108 improvements 9 months ago
WaseemAbbasi22 56c70671d8 add contact and created by information for asset transfer and gasrefill request 10 months ago
Sikander Saleem e3b63c76ba itg form status added. 10 months ago
WaseemAbbasi22 7b57ca54c3 renaming done as per pdf shared 10 months ago
WaseemAbbasi22 06acdb184f Merge remote-tracking branch 'origin/design_3.0_TM_Module_bug_fixes' into design_3.0_TM_Module_bug_fixes
# Conflicts:
#	lib/views/pages/device_transfer/update_device_transfer.dart
10 months ago
WaseemAbbasi22 b320e3751a add code for nurse edit gas refill request 10 months ago
Sikander Saleem 16a0f20fbb cost added. 10 months ago
Sikander Saleem 36657cd5ca cost added & refactor. 10 months ago
Sikander Saleem 8c9a8aa326 FMS- description of finding & action taken field added. 10 months ago
WaseemAbbasi22 02ccdd1f6a ATOMS-856 fixed 10 months ago
WaseemAbbasi22 72823e37f8 bug-771,804,773,769,776,794,801,796,797,799,811,814 fixed 10 months ago
Sikander Saleem 3ee2b66fbf code clean, unused files removed. 10 months ago