Commit Graph

1208 Commits (design_3.0_asset_inventory_module)

Author SHA1 Message Date
WaseemAbbasi22 bcb54f6279 enabledEngineerTimer parameter added 5 months ago
WaseemAbbasi22 cfdf41233c Merge remote-tracking branch 'origin/design_3.0_TM_Module_bug_fixes' into design_3.0_TM_Module_bug_fixes 5 months ago
WaseemAbbasi22 a241b4a24e return to service datepicker issue fixed 5 months ago
Sikander Saleem 2d39a6453c improvement. 5 months ago
Sikander Saleem 6050e47d26 Merge remote-tracking branch 'origin/design_3.0_TM_Module_bug_fixes' into design_3.0_TM_Module_bug_fixes 5 months ago
Sikander Saleem bed3a9821e decimal keyboard on traveling hours, email keyboard for email for external engineer 5 months ago
Sikander Saleem 13be4e960a notification issue, otp issue fixed. 5 months ago
WaseemAbbasi22 4d15dc9dab mark as complete confirmation dialog and new timer added for all type of requests 5 months ago
Sikander Saleem 4c88dce72c Merge remote-tracking branch 'origin/design_3.0_TM_Module_bug_fixes' into design_3.0_TM_Module_bug_fixes
# Conflicts:
#	lib/controllers/api_routes/urls.dart
5 months ago
Sikander Saleem 64a2d39cb1 timer picker added and improvements 5 months ago
WaseemAbbasi22 319a5acfa5 cost and attachment visibility check added 5 months ago
WaseemAbbasi22 1e5c43d02e cost parameters and activity assign user check added. 5 months ago
Sikander Saleem 7f594fbb41 timer tab switch issue fixed. 5 months ago
SikanderSaleem b29284f59f changes for ios release 5 months ago
Sikander Saleem 6bf9f22af4 improvements 5 months ago
Sikander Saleem 2acfa82a6f production config. 5 months ago
Sikander Saleem 06d8fc4329 improvement 5 months ago
Sikander Saleem 10dd969d71 signature null values fix. 5 months ago
WaseemAbbasi22 69d10c50de Merge remote-tracking branch 'origin/design_3.0_TM_Module_bug_fixes' into design_3.0_TM_Module_bug_fixes
# Conflicts:
#	lib/controllers/api_routes/urls.dart
5 months ago
WaseemAbbasi22 8ae51480f9 added nurse signature for device transfer request and tested on uat 5 months ago
Sikander Saleem 6d4b57db01 rename 5 months ago
Sikander Saleem 65064bc0a2 low priority removed from gas refill, transfer, ppm and sparepart cost. 5 months ago
Sikander Saleem e26db46108 improvements 5 months ago
WaseemAbbasi22 56c70671d8 add contact and created by information for asset transfer and gasrefill request 5 months ago
WaseemAbbasi22 330efd90be Merge remote-tracking branch 'origin/design_3.0_TM_Module_bug_fixes' into design_3.0_TM_Module_bug_fixes 5 months ago
Sikander Saleem e3b63c76ba itg form status added. 6 months ago
Sikander Saleem b4587a6347 hide task module & recurrent WO for nurse 6 months ago
Sikander Saleem 84bf5ac399 undo certificate check. 6 months ago
Sikander Saleem 2e4e567f1d certificate issue fixed. 6 months ago
WaseemAbbasi22 06e8831d02 add label for destination site details 6 months ago
WaseemAbbasi22 7b57ca54c3 renaming done as per pdf shared 6 months ago
Sikander Saleem 1900715559 Merge remote-tracking branch 'origin/design_3.0_TM_Module_bug_fixes' into design_3.0_TM_Module_bug_fixes 6 months ago
Sikander Saleem 71b392fe1f 1.2.8 released on playstore. 6 months ago
WaseemAbbasi22 0996801f66 notification testing done for all type of request on dev env. 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 5169894dc4 code restructured and improvements. 6 months ago
Sikander Saleem 16a0f20fbb cost added. 6 months ago
WaseemAbbasi22 0b97ffe296 Merge remote-tracking branch 'origin/design_3.0_TM_Module_bug_fixes' into design_3.0_TM_Module_bug_fixes 6 months ago
Sikander Saleem 36657cd5ca cost added & refactor. 6 months ago
WaseemAbbasi22 c1c595b135 Merge remote-tracking branch 'origin/design_3.0_TM_Module_bug_fixes' into design_3.0_TM_Module_bug_fixes 6 months ago
WaseemAbbasi22 4698a3325e add validation for assistant employee start and end date 6 months ago
Sikander Saleem 413f6cc398 refactor service request to cm module 6 months ago
Sikander Saleem 8c9a8aa326 FMS- description of finding & action taken field added. 6 months ago
Sikander Saleem a54370005f bug 902 fixed. 6 months ago
Sikander Saleem 56c758f0a7 Merge remote-tracking branch 'origin/design_3.0_TM_Module_bug_fixes' into design_3.0_TM_Module_bug_fixes 6 months ago
Sikander Saleem 8dc35a20af FMS- engineer can create CM request, hide priority for nurse. 6 months ago
WaseemAbbasi22 7251ba0e93 ATOMS-893 fixed 6 months ago
WaseemAbbasi22 6004ed1a27 ATOMS-820 fixed 6 months ago
WaseemAbbasi22 bd2155ea21 Merge remote-tracking branch 'origin/design_3.0_TM_Module_bug_fixes' into design_3.0_TM_Module_bug_fixes 6 months ago
WaseemAbbasi22 f780049e87 ATOMS-881 fixed 6 months ago
Sikander Saleem 225aa697bd Bug 878 fixed 6 months ago
Sikander Saleem e16233e642 Bug 877,fixed 6 months ago
Sikander Saleem 4e1ff56c65 type of alert added. 6 months ago
Sikander Saleem c41d43d890 Merge remote-tracking branch 'origin/design_3.0_TM_Module_bug_fixes' into design_3.0_TM_Module_bug_fixes 6 months ago
WaseemAbbasi22 facbb9002d ATOMS-811 fixed 6 months ago
WaseemAbbasi22 eeafda869a ATOMS-857 fixed 6 months ago
Sikander Saleem 91fb195d4f bug 860 fixed. 6 months ago
WaseemAbbasi22 ef7722ab2a Merge remote-tracking branch 'origin/design_3.0_TM_Module_bug_fixes' into design_3.0_TM_Module_bug_fixes
# Conflicts:
#	lib/new_views/pages/land_page/create_request-type_bottomsheet.dart
6 months ago
WaseemAbbasi22 02ccdd1f6a ATOMS-856 fixed 6 months ago
Sikander Saleem b77acfacd6 Merge remote-tracking branch 'origin/design_3.0_TM_Module_bug_fixes' into design_3.0_TM_Module_bug_fixes 6 months ago
WaseemAbbasi22 e3531d471d ATOMS-783 fixed 6 months ago
Sikander Saleem 50ca2bb8a3 create request method improvement. 6 months ago
WaseemAbbasi22 b577343353 Merge remote-tracking branch 'origin/design_3.0_TM_Module_bug_fixes' into design_3.0_TM_Module_bug_fixes 6 months ago
WaseemAbbasi22 824f46b0e3 ATOMS-823, ATOMS-825, ATOMS-782, ATOMS-784, ATOMS-807, issues fixed 6 months ago
Sikander Saleem 50fb07b504 on back confirmation dialog added on gas refill, task and asset transfer 6 months ago
Sikander Saleem 5b3d746b14 ui improvements & task details added on details screen 6 months ago
Sikander Saleem 68ee5d9da7 Bug 770 fixed. 6 months ago
WaseemAbbasi22 5e9ba71be6 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 99249b4839 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/device_transfer_details.dart
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
Sikander Saleem 14c2decd75 Bug 789 fixed. 6 months ago
WaseemAbbasi22 72823e37f8 bug-771,804,773,769,776,794,801,796,797,799,811,814 fixed 6 months ago
WaseemAbbasi22 aca081aee5 Merge branch 'design_3.0_TM_Module' into design_3.0_TM_Module_bug_fixes 6 months ago
WaseemAbbasi22 cf30e72926 added missing information on task detail page and also added value for task on dashboard list 6 months ago
WaseemAbbasi22 93c7fb553d task detail page improvement 6 months ago
Sikander Saleem 71a0ead92c loading dialog fix on save and continue button. 6 months ago
Sikander Saleem 3ee2b66fbf code clean, unused files removed. 6 months ago
Sikander Saleem 002172ab87 unused file 6 months ago
Sikander Saleem b8f6473378 UAt apk provided To QA. 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 2abe98726e code improvements. 6 months ago
Sikander Saleem 33dea07449 merge conflict resolved and file format. 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 042760e1c9 Merge remote-tracking branch 'origin/design_3.0_task_flow' into design_3.0_task_flow
# Conflicts:
#	lib/views/pages/user/tasks_request/create_task_view.dart
7 months ago
WaseemAbbasi22 14e55c63e7 create task flow completed 7 months ago
Sikander Saleem b75c0b321d multiple asset picker added. 7 months ago
WaseemAbbasi22 0fdbe8722e task request item view api integrated 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 b34014e24f sender and receiver comment fixed 7 months ago
Sikander Saleem e66ae78c83 files format 7 months ago
Sikander Saleem 015b73b634 ponit 87 fixed. 7 months ago
WaseemAbbasi22 5963a27213 Merge remote-tracking branch 'origin/demo_branch' into demo_branch 7 months ago
WaseemAbbasi22 43820f01d3 asset transfer attachment issue fixed 7 months ago
Sikander Saleem b0d5e03d5c Merge remote-tracking branch 'origin/demo_branch' into demo_branch 7 months ago
Sikander Saleem c4c68fbe8b asset fixes 7 months ago
WaseemAbbasi22 b592e114bc gas refill attachment issue fixed 7 months ago
WaseemAbbasi22 2291350d6f added request type for task requests 7 months ago
WaseemAbbasi22 be276f327d view activities for closed request issue fixed 7 months ago
Sikander Saleem ac0cf47a8d point 49 fixed, 7 months ago
Sikander Saleem f043c6ff6c point 8 fixed, 7 months ago
WaseemAbbasi22 b506616f48 bug fixes for recurrent task and service request added missing details mentioned in bugs sheet 7 months ago
WaseemAbbasi22 4d45dcf0b9 maintenance request complete ui issue fixes 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 045c890a27 bug fixes 7 months ago
WaseemAbbasi22 ab91baf216 bug fixes mentioned on excel sheet and tested with backend 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
WaseemAbbasi22 a66215ef8b bug fixes 7 months ago
Sikander Saleem 68c4df0c14 validateAssetSituation check removed handled from backend 7 months ago
Sikander Saleem e13a7c9634 rename text 7 months ago
Sikander Saleem 5825464ed5 ppm wo inspection back button added. 7 months ago
Sikander Saleem bbc584800a CM contact info added. 7 months ago
Sikander Saleem c4847f172c Merge remote-tracking branch 'origin/design_3.0_ppm_new_flow' into design_3.0_ppm_new_flow 7 months ago
Sikander Saleem 99ef704913 rename points done 7 months ago
WaseemAbbasi22 6b93479170 work order attachment added 7 months ago
Sikander Saleem 544dffc03f chart updated overview screen. 7 months ago
Sikander Saleem 5302858097 confirmation dialog added on ppm & recurrent 7 months ago
Sikander Saleem f99ea0dacd remove camel case text, confirmation dialog added, on back press. 7 months ago
WaseemAbbasi22 15e62bb004 Task Request Design complete 8 months ago
Sikander Saleem 6b51805827 improvement 8 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
WaseemAbbasi22 eb978af46f installition type task engineer ui complete 8 months ago
WaseemAbbasi22 54db7c97fc Task Request nurse side ui completed 8 months ago
Sikander Saleem 280c84a9cc full screen dialog added for selection. 8 months ago
Sikander Saleem c1295ac7b0 bug 726 fixed. 8 months ago
Sikander Saleem f6b4b77aed bug 734 fixed. 8 months ago
Sikander Saleem 15023ea99d bug 726 fixed. 8 months ago
WaseemAbbasi22 289d06ff68 Asset transfer nurse side ui completed 8 months ago
Sikander Saleem ef50f37a15 bug 703 fixed. 8 months ago
Sikander Saleem 5ab0ba4c2c bug 710 & 711 fixed. 8 months ago
WaseemAbbasi22 48591de22a Merge branch 'design_3.0_ppm_new_flow' into design_3.0_transfer_request_new_flow 8 months ago
Sikander Saleem bd362cb0f6 bug 706 fixed. 8 months ago
Sikander Saleem ab6608f5a6 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 b767f9123e 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
Sikander Saleem 2a6277ee76 Merge remote-tracking branch 'origin/design_3.0_ppm_new_flow' into design_3.0_ppm_new_flow 8 months ago
WaseemAbbasi22 f06426091b room null value issue fixed in recurrent task 8 months ago
WaseemAbbasi22 52626e7495 ui issue fixed for verify asset details screen 8 months ago
WaseemAbbasi22 3f90630db9 gas refill and asset transfer ui completed waiting for api 8 months ago
Sikander Saleem 0a06ad9fe3 privacy policy check added. 8 months ago
Sikander Saleem 880f1eb1f0 development mode and external storage excluded from device security check. 8 months ago
Sikander Saleem c9b3538720 test done with UAT env and UAT-PM-Task-Apk created 8 months ago
Sikander Saleem 8d9de6ce1a history log improvement added. 8 months ago
Sikander Saleem edd22bf4af stop working hide for nurse. 8 months ago
Sikander Saleem 8fe01adcb0 ppm pm kits improvement 8 months ago
Sikander Saleem 5a211a295f ppm dynamic tabs added. 8 months ago
Sikander Saleem 1893b45dc9 ppm timer fix. 8 months ago
Sikander Saleem 58c0f176a6 Merge remote-tracking branch 'origin/design_3.0_ppm_new_flow' into design_3.0_ppm_new_flow 8 months ago
Sikander Saleem a31c82f188 nurse dashboard categories order changed. 8 months ago
WaseemAbbasi22 7df18179a1 ppm task supplier ui completed and save and update api implemented 8 months ago
Sikander Saleem 4c328b2cba recurrent task timer improvements. 9 months ago
Sikander Saleem 86aeddc6c2 Merge remote-tracking branch 'origin/design_3.0_ppm_new_flow' into design_3.0_ppm_new_flow 9 months ago
WaseemAbbasi22 b67e6dea11 Recurrent Work Order Complete ready to test 9 months ago
Sikander Saleem b6e2cc9276 timer improvements for CM. 9 months ago
Sikander Saleem 729e7ad901 timer improvements. 9 months ago
Sikander Saleem 0246bb1606 ppm timer improvement cont-1 9 months ago
Sikander Saleem 58fb4b3829 cm feedback points, 9 months ago
Sikander Saleem 28b30d9fa8 ppm data model upgraded. 9 months ago
WaseemAbbasi22 c5d3eead2d Merge remote-tracking branch 'origin/design_3.0_ppm_new_flow' into design_3.0_ppm_new_flow 9 months ago
WaseemAbbasi22 8c9b1b3c46 missing attributes added for recurrent task 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 ed1337e16d recurrent task ui complete 9 months ago
Sikander Saleem 81d4fa6a89 ppm calibration tools, pm kits and checklist ui changed 9 months ago
WaseemAbbasi22 ae3b9297d5 Merge branch 'design_3.0_non_hmg_emp_flow' into design_3.0_ppm_new_flow 9 months ago
WaseemAbbasi22 be413d4e7b in progress 9 months ago
WaseemAbbasi22 8a5478f37f initial commit 9 months ago
Sikander Saleem 27097956cb gas quantity field change to dropdown 9 months ago
Sikander Saleem 31f94bd110 Merge remote-tracking branch 'origin/design_3.0_non_hmg_emp_flow' into design_3.0_non_hmg_emp_flow 10 months ago
WaseemAbbasi22 b5bfb3c0c0 arrival bottomsheet dismiss fixes and add check for next step value 10 months ago
Sikander Saleem d89ec1d317 improvements 10 months ago
WaseemAbbasi22 08428fc745 swipe module and reset password added 10 months ago
WaseemAbbasi22 a5876ec1d3 swipe module added 10 months ago
WaseemAbbasi22 ba50ed5809 add swipe and forget password apis 10 months ago
Sikander Saleem ef38c3d2bd non hmg mark attendance module added. 11 months ago
Sikander Saleem 561881c7f2 non hmg employee cont-1 11 months ago
Sikander Saleem e6e152bfc0 improvement. 11 months ago
Sikander Saleem a498a229d1 install and return qty added on spare part edit. 11 months ago
Sikander Saleem bb4087a948 activities reorder list removed, text remove from login page, rename text duplicate request. 11 months ago
Sikander Saleem f3d52eef52 bug fixes 11 months ago
WaseemAbbasi22 657526736c add reminder to device calendar fixes 11 months ago
WaseemAbbasi22 ff7ab84650 calander implementation inprogress 11 months ago