Commit Graph

366 Commits (413f6cc398b4fc1bc9442ce02fa9c4bb90bba7fe)

Author SHA1 Message Date
Sikander Saleem 8dc35a20af FMS- engineer can create CM request, hide priority for nurse. 6 months ago
Sikander Saleem 91fb195d4f bug 860 fixed. 6 months ago
WaseemAbbasi22 e3531d471d ATOMS-783 fixed 6 months ago
WaseemAbbasi22 a42466b578 ATOMS-771, ATOMS-804, ATOMS-773, ATOMS-769, ATOMS-776, ATOMS-794, ATOMS-801, ATOMS-796, ATOMS-790, ATOMS-797, ATOMS-799, ATOMS-811, ATOMS-811, ATOMS-817, ATOMS-814, ATOMS-820, ATOMS-829, issues 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 b8f6473378 UAt apk provided To QA. 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 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 e66ae78c83 files format 7 months ago
Sikander Saleem 015b73b634 ponit 87 fixed. 7 months ago
WaseemAbbasi22 2291350d6f added request type for task requests 7 months ago
WaseemAbbasi22 e74f506be0 part avalibility ui implemented 7 months ago
WaseemAbbasi22 6795ba7f72 device transfer gas refill merged in ppm_newflow 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 ab91baf216 bug fixes mentioned on excel sheet and tested with backend 7 months ago
WaseemAbbasi22 a66215ef8b bug fixes 7 months ago
WaseemAbbasi22 6b93479170 work order attachment added 7 months ago
Sikander Saleem ec63446802 Merge branch 'refs/heads/design_3.0_ppm_new_flow' into design_3.0_transfer_request_new_flow
# Conflicts:
#	lib/views/pages/user/ppm/ppm_work_order/recurrent_wo/components/task_info_widget.dart
8 months ago
WaseemAbbasi22 be8c83cc8f Asset tranfer api integrated ready to test 8 months ago
Sikander Saleem ef50f37a15 bug 703 fixed. 8 months ago
WaseemAbbasi22 6bd888e06a Merge branch 'design_3.0_ppm_new_flow' into design_3.0_transfer_request_new_flow 8 months ago
WaseemAbbasi22 152a0795c6 add and update gas refill ui and api integrated 8 months ago
Sikander Saleem 4a7f1eb037 ppm improvement, recurrent task improvement 8 months ago
WaseemAbbasi22 3f90630db9 gas refill and asset transfer ui completed waiting for api 8 months ago
Sikander Saleem c9b3538720 test done with UAT env and UAT-PM-Task-Apk created 8 months ago
Sikander Saleem edd22bf4af stop working hide for nurse. 9 months ago
Sikander Saleem 8fe01adcb0 ppm pm kits improvement 9 months ago
Sikander Saleem 58c0f176a6 Merge remote-tracking branch 'origin/design_3.0_ppm_new_flow' into design_3.0_ppm_new_flow 9 months ago
WaseemAbbasi22 7df18179a1 ppm task supplier ui completed and save and update api implemented 9 months ago
Sikander Saleem 4c328b2cba recurrent task timer improvements. 9 months ago
WaseemAbbasi22 b67e6dea11 Recurrent Work Order Complete ready to test 9 months ago
Sikander Saleem 28b30d9fa8 ppm data model upgraded. 9 months ago
Sikander Saleem 84dd801ed1 Merge remote-tracking branch 'origin/design_3.0_ppm_new_flow' into design_3.0_ppm_new_flow
# Conflicts:
#	lib/views/pages/user/ppm/ppm_details_page.dart
#	lib/views/pages/user/ppm/ppm_work_order/recurrent_wo/recurrent_work_order_view.dart
9 months ago
Sikander Saleem 2cd5777f55 ppm model improvement. 9 months ago
WaseemAbbasi22 7b620b9f6e Merge remote-tracking branch 'origin/design_3.0_ppm_new_flow' into design_3.0_ppm_new_flow 9 months ago
WaseemAbbasi22 ce1044f201 timer and working hours issue fixes 9 months ago
Sikander Saleem 0a8b3314ce unsafe device added, swipe only added, force update added, 9 months ago
WaseemAbbasi22 ecaf58fcdc Merge branch 'refs/heads/design_3.0_non_hmg_emp_flow' into design_3.0_ppm_new_flow
# Conflicts:
#	lib/l10n/app_ar.arb
#	lib/l10n/app_en.arb
#	lib/new_views/pages/land_page/widgets/request_item_view_list.dart
9 months ago
WaseemAbbasi22 d181c81029 save and complete api integrated for recurrent task 9 months ago
WaseemAbbasi22 99bcae1dc2 recurrent task api integrated 9 months ago
WaseemAbbasi22 c15cec364d Gas refill and Asset Transfer attributes addition done 9 months ago
WaseemAbbasi22 b5bfb3c0c0 arrival bottomsheet dismiss fixes and add check for next step value 10 months ago
WaseemAbbasi22 a5876ec1d3 swipe module added 10 months ago
WaseemAbbasi22 ba50ed5809 add swipe and forget password apis 10 months ago
Sikander Saleem 561881c7f2 non hmg employee cont-1 11 months ago