Commit Graph

112 Commits (d3c000004e4bebffc158aad603dc840eb6d7a956)

Author SHA1 Message Date
WaseemAbbasi22 8578319cc3 asset inventory module ready for qa 3 weeks ago
WaseemAbbasi22 c19fdb173b api integrated for main views 4 weeks ago
Sikander Saleem 0efc166a69 total working hour parameter changed. 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 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
Sikander Saleem bb0a031104 1.3.9+28 uploaded. 2 months ago
WaseemAbbasi22 ccef98860f recall and alert type request added 2 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
WaseemAbbasi22 8d02ff5ec1 mr number and exchange cost added 3 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
3 months ago
WaseemAbbasi22 1285ae68ec multiple assistant employee structure added 3 months ago
WaseemAbbasi22 705dff245d multiple assistant employee structure added 3 months ago
Sikander Saleem ffbe58b6c6 Merge remote-tracking branch 'origin/design_3.0_TM_Module_snagsFix' into design_3.0_TM_Module_snagsFix 3 months ago
WaseemAbbasi22 32627bbda1 form fixes 3 months ago
Sikander Saleem 95ab0192fe edd and cm frame improvements 3 months ago
WaseemAbbasi22 621ca230f5 Bug 904 fixes and add validation for assist employee start and end date in maintenance request 4 months ago
Sikander Saleem a626934b78 merge improvement 4 months ago
WaseemAbbasi22 ac45e20711 Bug 931, 934 fixed 4 months ago
Sikander Saleem a2e5a8a588 otp verification improved, serial no added 4 months ago
Sikander Saleem 62dd395a73 timer picker added, and code improvements 4 months ago
WaseemAbbasi22 4d15dc9dab mark as complete confirmation dialog and new timer added for all type of requests 5 months ago
WaseemAbbasi22 1e5c43d02e cost parameters and activity assign user check added. 5 months ago
Sikander Saleem e26db46108 improvements 6 months ago
WaseemAbbasi22 56c70671d8 add contact and created by information for asset transfer and gasrefill request 6 months ago
Sikander Saleem e3b63c76ba itg form status added. 6 months ago
WaseemAbbasi22 7b57ca54c3 renaming done as per pdf shared 6 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
6 months ago
WaseemAbbasi22 b320e3751a add code for nurse edit gas refill request 6 months ago
Sikander Saleem 16a0f20fbb cost added. 6 months ago
Sikander Saleem 36657cd5ca cost added & refactor. 6 months ago
Sikander Saleem 8c9a8aa326 FMS- description of finding & action taken field added. 6 months ago
WaseemAbbasi22 02ccdd1f6a ATOMS-856 fixed 6 months ago
WaseemAbbasi22 72823e37f8 bug-771,804,773,769,776,794,801,796,797,799,811,814 fixed 6 months ago
Sikander Saleem 3ee2b66fbf code clean, unused files removed. 6 months ago
Sikander Saleem 98234dc2c7 Merge branch 'refs/heads/design_3.0_task_flow' into design_3.0_tm_module_task_flow_merged 6 months ago
WaseemAbbasi22 b836170ae8 task detail page improvement 6 months ago
Sikander Saleem e0902eddf7 Merge branch 'refs/heads/demo_branch' into design_3.0_tm_module_task_flow
# Conflicts:
#	lib/controllers/api_routes/urls.dart
#	lib/extensions/widget_extensions.dart
#	lib/l10n/app_ar.arb
#	lib/l10n/app_en.arb
#	lib/new_views/pages/land_page/create_request-type_bottomsheet.dart
#	lib/new_views/pages/new_gas_refill_request_page.dart
#	lib/views/pages/user/gas_refill/request_gas_refill.dart
#	lib/views/widgets/equipment/asset_picker.dart
6 months ago
WaseemAbbasi22 9edaca4326 task request module flow completed and tested with backend 6 months ago
WaseemAbbasi22 14e55c63e7 create task flow completed 7 months ago
Sikander Saleem 353ff337f7 file format 7 months ago
Sikander Saleem f50ede8321 Merge remote-tracking branch 'origin/demo_branch' into demo_branch
# Conflicts:
#	lib/views/pages/user/gas_refill/gas_refill_form.dart
7 months ago
WaseemAbbasi22 71ee34c658 gas refill attachment and device transfer assistant employee issue fixes 7 months ago
Sikander Saleem 015b73b634 ponit 87 fixed. 7 months ago
WaseemAbbasi22 ef6c14ba55 Merge branch 'design_3.0_transfer_request_new_flow' into demo_branch
# Conflicts:
#	lib/controllers/api_routes/urls.dart
#	lib/l10n/app_ar.arb
#	lib/l10n/app_en.arb
#	lib/models/new_models/gas_refill_model.dart
#	lib/new_views/common_widgets/default_app_bar.dart
#	lib/views/pages/user/gas_refill/gas_refill_details.dart
#	lib/views/pages/user/ppm/update_ppm/ppm_pm_kits_form.dart
7 months ago
WaseemAbbasi22 5031c3cbb8 gas refill fixes 7 months ago
WaseemAbbasi22 4954549594 bug fixes for workorder detail view 7 months ago
WaseemAbbasi22 e4dd92c4a9 Merge remote-tracking branch 'origin/design_3.0_ppm_new_flow' into design_3.0_ppm_new_flow
# Conflicts:
#	lib/views/pages/user/ppm/update_ppm/wo_info_form.dart
7 months ago