Commit Graph

1208 Commits (design_3.0_asset_inventory_module)

Author SHA1 Message Date
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
WaseemAbbasi22 ec66c6fd17 Merge remote-tracking branch 'origin/design_3.0_sdk_upgrade' into design_3.0_sdk_upgrade
# Conflicts:
#	lib/service_request_latest/views/components/bottom_sheets/service_request_bottomsheet.dart
11 months ago
WaseemAbbasi22 fa331c7917 open request for engineer fixies 11 months ago
Sikander Saleem 45a98b18e1 on category list was refreshing everytime, fixed. 11 months ago
Sikander Saleem e878881e5a request confirmation improvements. 11 months ago
Sikander Saleem 38e481848d Merge remote-tracking branch 'origin/design_3.0_sdk_upgrade' into design_3.0_sdk_upgrade 11 months ago
WaseemAbbasi22 d29c0d6fb1 design fixes 11 months ago
Sikander Saleem dbea53734b Merge remote-tracking branch 'origin/design_3.0_sdk_upgrade' into design_3.0_sdk_upgrade 11 months ago
WaseemAbbasi22 e5647bc4f4 design fixes 11 months ago
WaseemAbbasi22 3787bb26e4 testing issues fixed 11 months ago
WaseemAbbasi22 655a5cf790 all changes implemented 11 months ago
WaseemAbbasi22 904f1919d4 all changes implemented 12 months ago
WaseemAbbasi22 9072df77c3 improvements 1 year ago
Sikander Saleem d898dda015 Merge remote-tracking branch 'origin/design_3.0_sdk_upgrade' into design_3.0_sdk_upgrade
# Conflicts:
#	lib/service_request_latest/views/components/verify_arrival_view.dart
1 year ago
WaseemAbbasi22 8a9eabac2f improvements 1 year ago
WaseemAbbasi22 778bf30eb6 improvements 1 year ago
WaseemAbbasi22 78ebf9e60d improvements 1 year ago
WaseemAbbasi22 0481797bb6 bug fixes 1 year ago
Sikander Saleem c6dcec4a3c test 1 year ago
WaseemAbbasi22 16c6640d9c bug fixes 1 year ago
WaseemAbbasi22 c1ec32fa33 bug fixes 1 year ago
WaseemAbbasi22 501c78dc09 notifications implemented 1 year ago
WaseemAbbasi22 d3ed7e39c2 notification in progress 1 year ago
WaseemAbbasi22 7aed41380b notification in progress 1 year ago
Sikander Saleem dc9266a0da approval bottom sheet added. & improvements. 1 year ago
muhammad.abbasi 388761a8aa ready for testing 1 year ago
muhammad.abbasi 3c03ef2e34 all fixed 1 year ago
WaseemAbbasi22 7ebd01d012 in progress 1 year ago
WaseemAbbasi22 abed426de2 in progress 1 year ago
WaseemAbbasi22 5ccdcd087a all the changes are implemented 1 year ago
WaseemAbbasi22 87e31978f5 Merge branch 'design_3.0_sdk_upgrade' into design_3.0_latest 1 year ago
WaseemAbbasi22 4c9a730e24 all the changes are implemented 1 year ago
WaseemAbbasi22 38ce0bd9a0 Merge branch 'design_3.0_fixes' into design_3.0_latest
# Conflicts:
#	lib/dashboard_latest/dashboard_provider.dart
#	lib/dashboard_latest/widgets/request_category_fragment.dart
#	lib/dashboard_latest/widgets/requests_fragment.dart
#	lib/extensions/enum_extensions.dart
#	lib/l10n/app_ar.arb
#	lib/models/new_models/arrival_verification_type_model.dart
#	lib/new_views/pages/land_page/requests/service_request_item_view.dart
#	lib/service_request_latest/service_request_detail_provider.dart
#	lib/service_request_latest/utilities/service_request_utils.dart
#	lib/service_request_latest/views/components/action_button/footer_action_button.dart
#	lib/service_request_latest/views/components/activities_list_view.dart
#	lib/service_request_latest/views/components/service_request_detail_view.dart
#	lib/service_request_latest/views/components/verify_arrival_view.dart
#	lib/service_request_latest/views/forms/asset_retired/verify_asset_detail.dart
#	lib/service_request_latest/views/service_request_detail_main_view.dart
1 year ago
Sikander Saleem 5d0b3b696a Merge remote-tracking branch 'origin/design_3.0_sdk_upgrade' into design_3.0_sdk_upgrade 1 year ago
Sikander Saleem 3633321d88 speech to text added on description field & improvements. 1 year ago
WaseemAbbasi22 3a27b9d6ca implement scan qr code and ask requester to verify flow 1 year ago
WaseemAbbasi22 4be1bd2e8a verify asset detail form changes 1 year ago
WaseemAbbasi22 da664e957b implement changes mentioned in testing document 1 year ago
WaseemAbbasi22 7f563e8292 Merge remote-tracking branch 'origin/design_3.0_sdk_upgrade' into design_3.0_sdk_upgrade 1 year ago
WaseemAbbasi22 dacfefcc3e fixes 1 year ago
WaseemAbbasi22 310ec59917 history log time duration added 1 year ago
Sikander Saleem 60e971a240 language added. 1 year ago
WaseemAbbasi22 85a32238fb Merge branch 'schedule_local_notification' into design_3.0_fixes
# Conflicts:
#	lib/service_request_latest/utilities/service_request_utils.dart
#	lib/service_request_latest/views/components/bottom_sheets/service_request_bottomsheet.dart
#	lib/service_request_latest/views/components/request_detail_view.dart
#	lib/service_request_latest/views/forms/maintenance_request/components/assistant_employee_card.dart
#	lib/service_request_latest/views/forms/maintenance_request/components/external_request.dart
#	lib/service_request_latest/views/forms/maintenance_request/components/internal_request.dart
1 year ago
WaseemAbbasi22 010aaf9fe2 working hours issue fixed 1 year ago
WaseemAbbasi22 f45e0e4f80 verify asset detail card added on detail screen 1 year ago
Sikander Saleem 58f5f6103a app red screen, on drawer & asset filter fixed. 1 year ago
muhammad.abbasi e582072a83 improvements 1 year ago
Sikander Saleem 318ae666c1 completed request improvement. 1 year ago
muhammad.abbasi fbdbdf67a0 improvements 1 year ago
Sikander Saleem 0d9e119c32 improvements 1 year ago
Sikander Saleem c9ce003b29 bug fixed & 1.3.0+12 sent for UAT 1 year ago
Sikander Saleem 426d47b64c Merge remote-tracking branch 'origin/design_3.0_sdk_upgrade' into design_3.0_sdk_upgrade
# Conflicts:
#	lib/service_request_latest/views/forms/maintenance_request/components/assistant_employee_card.dart
#	lib/views/widgets/status/assistant_employee_menu.dart
#	lib/views/widgets/status/report/service_report_assistant_employee_menu.dart
1 year ago
muhammad.abbasi 8b0bf4bedc timer implemented 1 year ago
Sikander Saleem f3695b90fb assistant employee improvements 1 year ago
Sikander Saleem f20929b1dc huawei integration added & code compatibility issues fix. 1 year ago
Sikander Saleem 6722e19cc5 spare part activity improvements 1 year ago
muhammad.abbasi f6b3c82fb3 activity status on sparepart activity and last situation in maintenance request added 1 year ago
muhammad.abbasi 0d2e8d63b7 Merge remote-tracking branch 'origin/design_3.0_sdk_upgrade' into design_3.0_sdk_upgrade
# Conflicts:
#	lib/service_request_latest/views/components/action_button/footer_action_button.dart
#	lib/service_request_latest/views/forms/asset_retired/verify_asset_detail.dart
1 year ago
muhammad.abbasi 8550fb98bf activity status on sparepart activity added. 1 year ago
Sikander Saleem 973c85418e code improvements & fixes. 1 year ago
muhammad.abbasi f65d5168de bottomsheet model reset while adding fixes 1 year ago
Sikander Saleem 01e0d054e6 code improvements. 1 year ago
muhammad.abbasi 1f30aec2ff verify arrival fixes 1 year ago
muhammad.abbasi 1655bab9ad verify arrival fixes 1 year ago
muhammad.abbasi b852b29a09 fix remotely working hours auto assign fixes 1 year ago
muhammad.abbasi 5d204687cc fix remotely working hours auto assign fixes 1 year ago
muhammad.abbasi 044eadaacc ready for initial testing 1 year ago
muhammad.abbasi 0dd4a0f254 Merge remote-tracking branch 'origin/design_3.0_sdk_upgrade' into design_3.0_sdk_upgrade
# Conflicts:
#	lib/models/new_models/work_order_detail_model.dart
1 year ago
muhammad.abbasi f1fe0b3339 edit maintenance request completed 1 year ago
Sikander Saleem 298a102f67 reorder activities added. 1 year ago
muhammad.abbasi 71d4ba43de add maintenance request completed 1 year ago
muhammad.abbasi 88b92d2d44 add maintenance request completed 1 year ago
muhammad.abbasi c2f4722bb3 add maintenance request completed 1 year ago
muhammad.abbasi 0b72f0b219 add maintenance request completed 1 year ago
muhammad.abbasi 77d18bd413 add maintenance request completed 1 year ago
Sikander Saleem 9628a6408e single dropdown loading fix. 1 year ago
Sikander Saleem 690b3822f5 code and logic improvements. 1 year ago
Sikander Saleem 40a96bad7c Merge remote-tracking branch 'origin/design_3.0_sdk_upgrade' into design_3.0_sdk_upgrade
# Conflicts:
#	lib/extensions/widget_extensions.dart
1 year ago
Sikander Saleem c0afad329b improvement. 1 year ago
muhammad.abbasi 457455a1b5 Merge remote-tracking branch 'origin/design_3.0_sdk_upgrade' into design_3.0_sdk_upgrade
# Conflicts:
#	lib/new_views/common_widgets/single_item_drop_down_menu.dart
1 year ago
muhammad.abbasi 0095facdf5 maintenance request flow in progress 1 year ago
Sikander Saleem e1aaa71ae7 spare part comment fix and improvement. 1 year ago
Sikander Saleem 701455d939 ui and spare part improvement. 1 year ago
Sikander Saleem 3484859028 dashboard & workorder details bug fixes. 1 year ago
muhammad.abbasi b04cd1e042 Merge remote-tracking branch 'origin/design_3.0_sdk_upgrade' into design_3.0_sdk_upgrade
# Conflicts:
#	lib/new_views/pages/land_page/land_page.dart
1 year ago
muhammad.abbasi 34e54df40d intial testing fixes 1 year ago
Sikander Saleem c556f0dd87 requests improvements-1 1 year ago
Sikander Saleem a55ef11780 requests improvements 1 year ago
muhammad.abbasi ec34de11c5 Merge remote-tracking branch 'origin/design_3.0_sdk_upgrade' into design_3.0_sdk_upgrade 1 year ago
muhammad.abbasi 473b26036e initial testing 1 year ago
Sikander Saleem b76a0bc53a new file picker added. 1 year ago
Sikander Saleem 2ec3b18231 dashboard status fragment only for engineer 1 year ago
muhammad.abbasi cc9b993de7 Merge remote-tracking branch 'origin/design_3.0_sdk_upgrade' into design_3.0_sdk_upgrade
# Conflicts:
#	lib/models/new_models/work_order_detail_model.dart
1 year ago
muhammad.abbasi c2b3288423 in progress 1 year ago
Sikander Saleem 0fa9173f01 history log improvement. 1 year ago
Sikander Saleem 0ea7954c6a history log completed. 1 year ago
muhammad.abbasi 58666916cc integrating api in new flow 1 year ago
muhammad.abbasi e8dc052d02 integrating api in new flow 1 year ago
muhammad.abbasi acbf33e2a2 Merge branch 'refs/heads/design_3.0_sdk_upgrade' into design_3.0_waseem_dev
# Conflicts:
#	lib/service_request_latest/views/components/request_detail_view.dart
1 year ago
muhammad.abbasi 8dd596bc35 -design completed 1 year ago
Sikander Saleem c6d8c299f7 merge conflict resolve. 1 year ago