Commit Graph

1301 Commits (60511b60cfb2afd76c15df2cdbfeff5e5442fb87)

Author SHA1 Message Date
Sikander Saleem f3539f1471 Merge branch 'refs/heads/design_3.0_TM_Module_snagsFix' into design_3.0_task_module_new_merge 5 months ago
Sikander Saleem 19ee892d67 app timer, time and date picker color improvements. 5 months ago
Sikander Saleem df8f0e7298 remember me username and password improvement. 5 months ago
Sikander Saleem c1b1f37eec asset search loading ui fixed. 5 months ago
Sikander Saleem a479a23790 Merge branch 'refs/heads/design_3.0_TM_Module_snagsFix' into design_3.0_TM_Module 5 months ago
Sikander Saleem c4efbba6a8 ui fixes 5 months ago
Sikander Saleem e3a97c0ae9 enable engineer time picker issue fixed, session expired dialog issue fixed. 5 months ago
Sikander Saleem 1edcea47be 1.3.6+25 merge conflict resolved. 5 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
5 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
5 months ago
Sikander Saleem 8517562d6a 1.3.6+25 uploaded 5 months ago
WaseemAbbasi22 841fc93783 calibration tool picker fixes 5 months ago
WaseemAbbasi22 0637a51ea0 spare part attachment fixes 5 months ago
Sikander Saleem f2eb4d7432 update asset details improvement. 5 months ago
Sikander Saleem 4fe2943a5f update asset details improvement. 5 months ago
WaseemAbbasi22 4e665d1959 attachment fixes 5 months ago
Sikander Saleem b4e8e82995 mr no keyboard type fix. 6 months ago
WaseemAbbasi22 dfe8f0c271 mr no and exchange cost added and tested in uat 6 months ago
WaseemAbbasi22 8d9aacb870 dark mode fixes 6 months ago
WaseemAbbasi22 0f7a8e0955 Merge branch 'design_3.0_TM_Module_snagsFix' into design_3.0_dark_mode 6 months ago
WaseemAbbasi22 8d02ff5ec1 mr number and exchange cost added 6 months ago
WaseemAbbasi22 7ecccf8bf8 improvements 6 months ago
WaseemAbbasi22 4ce0504ab7 dark mode implementation 6 months ago
WaseemAbbasi22 6d39b20e0b dark mode implementation 6 months ago
Sikander Saleem aa1d75de07 merge conflict resolved. 6 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
6 months ago
Sikander Saleem 2f1efaccee 1.3.5+24 uploaded. 6 months ago
SikanderSaleem 5589d5b563 asset currency model & ios face id failed improvement. 6 months ago
Sikander Saleem 0283c92f99 1.3.4+23 uploaded. 6 months ago
Sikander Saleem eba3154f32 splash session expired handled. 6 months ago
Sikander Saleem 5484c7f5a4 improvement 6 months ago
Sikander Saleem 262b3aa42f local auth fail handling and improvements. 6 months ago
Sikander Saleem 633c2da82a time zone header added 6 months ago
Sikander Saleem d9f3a4e73a Merge remote-tracking branch 'origin/design_3.0_TM_Module_snagsFix' into design_3.0_TM_Module_snagsFix 6 months ago
WaseemAbbasi22 b35522d8e6 Merge remote-tracking branch 'origin/design_3.0_TM_Module_snagsFix' into design_3.0_TM_Module_snagsFix 6 months ago
WaseemAbbasi22 503f3a6feb multiple assistant employee added for asset transfer and service-request 6 months ago
Sikander Saleem bf97215683 duplicate value added, to enable mark as complete. 6 months ago
WaseemAbbasi22 1285ae68ec multiple assistant employee structure added 6 months ago
Sikander Saleem a1e0c92b34 spare part validation added when create. 6 months ago
Sikander Saleem 37c3b54237 improvements 6 months ago
Sikander Saleem 6adea49150 image full screen loading improvement 6 months ago
WaseemAbbasi22 705dff245d multiple assistant employee structure added 6 months ago
Sikander Saleem ffbe58b6c6 Merge remote-tracking branch 'origin/design_3.0_TM_Module_snagsFix' into design_3.0_TM_Module_snagsFix 6 months ago
WaseemAbbasi22 59c4d8f9b0 Merge remote-tracking branch 'origin/design_3.0_TM_Module_snagsFix' into design_3.0_TM_Module_snagsFix 6 months ago
WaseemAbbasi22 32627bbda1 form fixes 6 months ago
Sikander Saleem 95ab0192fe edd and cm frame improvements 6 months ago
Sikander Saleem 93caf55354 edd and wo frame fields added. 6 months ago
Sikander Saleem 456432050d timezone header added, update ppm error flow improvement. 6 months ago
Sikander Saleem 3aef41a50f supplier engineer added for ppm external supplier 6 months ago
Sikander Saleem daa4a12893 improvement 6 months ago
WaseemAbbasi22 621ca230f5 Bug 904 fixes and add validation for assist employee start and end date in maintenance request 7 months ago
Sikander Saleem 754ec458a4 Merge branch 'refs/heads/design_3.0_TM_Module' into design_3.0_task_module_new
# Conflicts:
#	lib/views/widgets/images/multi_image_picker.dart
7 months ago
Sikander Saleem 4c92525589 1.3.3+22 uploaded 7 months ago
Sikander Saleem 12752535b8 improvements 7 months ago
Sikander Saleem 3181e666be improvements 7 months ago
Sikander Saleem 0a38bdd9e1 improvements 7 months ago
Sikander Saleem eead9bed02 improvements 7 months ago
Sikander Saleem a626934b78 merge improvement 7 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
7 months ago
Sikander Saleem c92aae9048 improvements 7 months ago
WaseemAbbasi22 ac45e20711 Bug 931, 934 fixed 7 months ago
WaseemAbbasi22 116855878b task timer issue fixed 7 months ago
Sikander Saleem 97adfa1def Merge remote-tracking branch 'origin/design_3.0_task_module_new' into design_3.0_task_module_new 7 months ago
Sikander Saleem d5059758ac Merge branch 'refs/heads/design_3.0_TM_Module' into design_3.0_task_module_new 7 months ago
WaseemAbbasi22 8b76629448 requestlist changes to model for status fixes 7 months ago
Sikander Saleem 9b9ce8c4b2 1.3.2+21 uploaded on stores. 7 months ago
Sikander Saleem bf44e5cbec verification method issue fixed, if requester not confirms arrival. 7 months ago
Sikander Saleem a2e5a8a588 otp verification improved, serial no added 7 months ago
Sikander Saleem 616ce9b630 timer picker end date selection fixed. 7 months ago
Sikander Saleem 8101521791 eng can create Task request. 7 months ago
Sikander Saleem 6539848f31 method name fix. 7 months ago
Sikander Saleem e9efca620d enable task module. 7 months ago
Sikander Saleem be2fd8a2d5 1.3.1+20 uploaded on stores 7 months ago
Sikander Saleem 5fd2bb1e5b vendor list issue when already have a supplier. 7 months ago
Sikander Saleem f3f09d1eb2 timer improvements 7 months ago
Sikander Saleem 407c913002 timer issue fixed. 7 months ago
WaseemAbbasi22 60979b7f95 Date picker end time fixes 7 months ago
Sikander Saleem 8129cdb768 gas refill details, contact info employee id fixed. 7 months ago
WaseemAbbasi22 547b815b61 End date picker last date changed to current date 7 months ago
Sikander Saleem 0dade3cedb unused code marked. 7 months ago
Sikander Saleem 0b0f2ba25c improvements. 7 months ago
Sikander Saleem 20b5ddb92b improvements. 7 months ago
Sikander Saleem 293dc809b7 Merge remote-tracking branch 'origin/design_3.0_TM_Module_bug_fixes' into design_3.0_TM_Module_bug_fixes 7 months ago
Sikander Saleem 40c37f5373 profile contact detail update added. 7 months ago
WaseemAbbasi22 9d4d678668 Service request attachment fixes 7 months ago
Sikander Saleem 50eb16ce32 Merge remote-tracking branch 'origin/design_3.0_TM_Module_bug_fixes' into design_3.0_TM_Module_bug_fixes 7 months ago
Sikander Saleem 46dd66b165 selection replaced to full screen. 7 months ago
WaseemAbbasi22 aa11d93409 update user contact info bottomsheet design and statedate time initial value added 7 months ago
Sikander Saleem fb6641f880 number keyboard replaced with decimal 7 months ago
Sikander Saleem afe0d45d86 Merge remote-tracking branch 'origin/design_3.0_TM_Module_bug_fixes' into design_3.0_TM_Module_bug_fixes 7 months ago
Sikander Saleem 4d13105b91 cancel a selection from bottom sheet dropdown added. 7 months ago
WaseemAbbasi22 9561b29822 update user info bottomsheet design and service request external date check added 7 months ago
Sikander Saleem 62dd395a73 timer picker added, and code improvements 7 months ago
WaseemAbbasi22 bcb54f6279 enabledEngineerTimer parameter added 7 months ago
WaseemAbbasi22 cfdf41233c Merge remote-tracking branch 'origin/design_3.0_TM_Module_bug_fixes' into design_3.0_TM_Module_bug_fixes 7 months ago
WaseemAbbasi22 a241b4a24e return to service datepicker issue fixed 7 months ago
Sikander Saleem 2d39a6453c improvement. 7 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 7 months ago
Sikander Saleem bed3a9821e decimal keyboard on traveling hours, email keyboard for email for external engineer 7 months ago
Sikander Saleem 13be4e960a notification issue, otp issue fixed. 7 months ago
WaseemAbbasi22 4d15dc9dab mark as complete confirmation dialog and new timer added for all type of requests 7 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
7 months ago
Sikander Saleem 64a2d39cb1 timer picker added and improvements 7 months ago
WaseemAbbasi22 319a5acfa5 cost and attachment visibility check added 7 months ago
WaseemAbbasi22 1e5c43d02e cost parameters and activity assign user check added. 7 months ago
Sikander Saleem 7f594fbb41 timer tab switch issue fixed. 7 months ago
SikanderSaleem b29284f59f changes for ios release 8 months ago
Sikander Saleem 6bf9f22af4 improvements 8 months ago
Sikander Saleem 2acfa82a6f production config. 8 months ago
Sikander Saleem 06d8fc4329 improvement 8 months ago
Sikander Saleem 10dd969d71 signature null values fix. 8 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
8 months ago
WaseemAbbasi22 8ae51480f9 added nurse signature for device transfer request and tested on uat 8 months ago
Sikander Saleem 6d4b57db01 rename 8 months ago
Sikander Saleem 65064bc0a2 low priority removed from gas refill, transfer, ppm and sparepart cost. 8 months ago
Sikander Saleem e26db46108 improvements 8 months ago
WaseemAbbasi22 56c70671d8 add contact and created by information for asset transfer and gasrefill request 8 months ago
WaseemAbbasi22 330efd90be Merge remote-tracking branch 'origin/design_3.0_TM_Module_bug_fixes' into design_3.0_TM_Module_bug_fixes 8 months ago
Sikander Saleem e3b63c76ba itg form status added. 8 months ago
Sikander Saleem b4587a6347 hide task module & recurrent WO for nurse 8 months ago
Sikander Saleem 84bf5ac399 undo certificate check. 8 months ago
Sikander Saleem 2e4e567f1d certificate issue fixed. 8 months ago
WaseemAbbasi22 06e8831d02 add label for destination site details 8 months ago
WaseemAbbasi22 7b57ca54c3 renaming done as per pdf shared 8 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 8 months ago
Sikander Saleem 71b392fe1f 1.2.8 released on playstore. 8 months ago
WaseemAbbasi22 0996801f66 notification testing done for all type of request on dev env. 8 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
8 months ago
WaseemAbbasi22 b320e3751a add code for nurse edit gas refill request 8 months ago
Sikander Saleem 5169894dc4 code restructured and improvements. 8 months ago
Sikander Saleem 16a0f20fbb cost added. 9 months ago
WaseemAbbasi22 0b97ffe296 Merge remote-tracking branch 'origin/design_3.0_TM_Module_bug_fixes' into design_3.0_TM_Module_bug_fixes 9 months ago
Sikander Saleem 36657cd5ca cost added & refactor. 9 months ago
WaseemAbbasi22 c1c595b135 Merge remote-tracking branch 'origin/design_3.0_TM_Module_bug_fixes' into design_3.0_TM_Module_bug_fixes 9 months ago
WaseemAbbasi22 4698a3325e add validation for assistant employee start and end date 9 months ago
Sikander Saleem 413f6cc398 refactor service request to cm module 9 months ago
Sikander Saleem 8c9a8aa326 FMS- description of finding & action taken field added. 9 months ago
Sikander Saleem a54370005f bug 902 fixed. 9 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 9 months ago
Sikander Saleem 8dc35a20af FMS- engineer can create CM request, hide priority for nurse. 9 months ago
WaseemAbbasi22 7251ba0e93 ATOMS-893 fixed 9 months ago
WaseemAbbasi22 6004ed1a27 ATOMS-820 fixed 9 months ago
WaseemAbbasi22 bd2155ea21 Merge remote-tracking branch 'origin/design_3.0_TM_Module_bug_fixes' into design_3.0_TM_Module_bug_fixes 9 months ago
WaseemAbbasi22 f780049e87 ATOMS-881 fixed 9 months ago
Sikander Saleem 225aa697bd Bug 878 fixed 9 months ago
Sikander Saleem e16233e642 Bug 877,fixed 9 months ago
Sikander Saleem 4e1ff56c65 type of alert added. 9 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 9 months ago
WaseemAbbasi22 facbb9002d ATOMS-811 fixed 9 months ago
WaseemAbbasi22 eeafda869a ATOMS-857 fixed 9 months ago
Sikander Saleem 91fb195d4f bug 860 fixed. 9 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
9 months ago
WaseemAbbasi22 02ccdd1f6a ATOMS-856 fixed 9 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 9 months ago
WaseemAbbasi22 e3531d471d ATOMS-783 fixed 9 months ago
Sikander Saleem 50ca2bb8a3 create request method improvement. 9 months ago
WaseemAbbasi22 b577343353 Merge remote-tracking branch 'origin/design_3.0_TM_Module_bug_fixes' into design_3.0_TM_Module_bug_fixes 9 months ago
WaseemAbbasi22 824f46b0e3 ATOMS-823, ATOMS-825, ATOMS-782, ATOMS-784, ATOMS-807, issues fixed 9 months ago
Sikander Saleem 50fb07b504 on back confirmation dialog added on gas refill, task and asset transfer 9 months ago
Sikander Saleem 5b3d746b14 ui improvements & task details added on details screen 9 months ago
Sikander Saleem 68ee5d9da7 Bug 770 fixed. 9 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 9 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
9 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 9 months ago
Sikander Saleem 14c2decd75 Bug 789 fixed. 9 months ago
WaseemAbbasi22 72823e37f8 bug-771,804,773,769,776,794,801,796,797,799,811,814 fixed 9 months ago
WaseemAbbasi22 aca081aee5 Merge branch 'design_3.0_TM_Module' into design_3.0_TM_Module_bug_fixes 9 months ago
WaseemAbbasi22 cf30e72926 added missing information on task detail page and also added value for task on dashboard list 9 months ago
WaseemAbbasi22 93c7fb553d task detail page improvement 9 months ago
Sikander Saleem 71a0ead92c loading dialog fix on save and continue button. 9 months ago
Sikander Saleem 3ee2b66fbf code clean, unused files removed. 9 months ago
Sikander Saleem 002172ab87 unused file 9 months ago
Sikander Saleem b8f6473378 UAt apk provided To QA. 9 months ago
Sikander Saleem 98234dc2c7 Merge branch 'refs/heads/design_3.0_task_flow' into design_3.0_tm_module_task_flow_merged 9 months ago
WaseemAbbasi22 b836170ae8 task detail page improvement 9 months ago
Sikander Saleem 2abe98726e code improvements. 9 months ago
Sikander Saleem 33dea07449 merge conflict resolved and file format. 9 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
9 months ago
WaseemAbbasi22 9edaca4326 task request module flow completed and tested with backend 9 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
9 months ago
WaseemAbbasi22 14e55c63e7 create task flow completed 9 months ago
Sikander Saleem b75c0b321d multiple asset picker added. 9 months ago
WaseemAbbasi22 0fdbe8722e task request item view api integrated 9 months ago
Sikander Saleem 353ff337f7 file format 9 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
9 months ago
WaseemAbbasi22 71ee34c658 gas refill attachment and device transfer assistant employee issue fixes 9 months ago
Sikander Saleem b34014e24f sender and receiver comment fixed 9 months ago
Sikander Saleem e66ae78c83 files format 9 months ago
Sikander Saleem 015b73b634 ponit 87 fixed. 9 months ago
WaseemAbbasi22 5963a27213 Merge remote-tracking branch 'origin/demo_branch' into demo_branch 9 months ago
WaseemAbbasi22 43820f01d3 asset transfer attachment issue fixed 9 months ago
Sikander Saleem b0d5e03d5c Merge remote-tracking branch 'origin/demo_branch' into demo_branch 9 months ago
Sikander Saleem c4c68fbe8b asset fixes 9 months ago
WaseemAbbasi22 b592e114bc gas refill attachment issue fixed 9 months ago
WaseemAbbasi22 2291350d6f added request type for task requests 9 months ago
WaseemAbbasi22 be276f327d view activities for closed request issue fixed 9 months ago
Sikander Saleem ac0cf47a8d point 49 fixed, 10 months ago
Sikander Saleem f043c6ff6c point 8 fixed, 10 months ago
WaseemAbbasi22 b506616f48 bug fixes for recurrent task and service request added missing details mentioned in bugs sheet 10 months ago
WaseemAbbasi22 4d45dcf0b9 maintenance request complete ui issue fixes 10 months ago