Commit Graph

486 Commits (ae6772e4342e7fcf9a82317c9fd068d203a23af0)

Author SHA1 Message Date
Sikander Saleem 68ee5d9da7 Bug 770 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
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 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 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 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 b592e114bc gas refill attachment issue fixed 7 months ago
WaseemAbbasi22 2291350d6f added request type for task requests 7 months ago
WaseemAbbasi22 b506616f48 bug fixes for recurrent task and service request added missing details mentioned in bugs sheet 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 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 e13a7c9634 rename text 7 months ago
Sikander Saleem 5825464ed5 ppm wo inspection back button added. 7 months ago
Sikander Saleem 99ef704913 rename points done 7 months ago
Sikander Saleem 5302858097 confirmation dialog added on ppm & recurrent 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 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
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 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 f06426091b room null value issue fixed in recurrent task 8 months ago
WaseemAbbasi22 3f90630db9 gas refill and asset transfer ui completed waiting for api 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 5a211a295f ppm dynamic tabs added. 9 months ago
Sikander Saleem 1893b45dc9 ppm timer fix. 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
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 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 ce1044f201 timer and working hours issue fixes 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
WaseemAbbasi22 78ebf9e60d improvements 1 year ago
WaseemAbbasi22 da664e957b implement changes mentioned in testing document 1 year ago
Sikander Saleem 318ae666c1 completed request improvement. 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 690b3822f5 code and logic improvements. 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 a55ef11780 requests improvements 1 year ago
Sikander Saleem 69ae0147bb Merge remote-tracking branch 'origin/design_3.0_sdk_upgrade' into design_3.0_sdk_upgrade
# Conflicts:
#	lib/dashboard_latest/dashboard_provider.dart
#	lib/dashboard_latest/dashboard_view.dart
#	lib/dashboard_latest/widgets/progress_fragment.dart
#	lib/dashboard_latest/widgets/requests_fragment.dart
#	lib/new_views/app_style/app_color.dart
#	lib/service_request_latest/request_detail_provider.dart
#	lib/service_request_latest/views/components/request_detail_view.dart
#	lib/service_request_latest/views/request_detail_main_view.dart
1 year ago
Sikander Saleem 0d333fa688 dashboard screen & service detail screen, flow changed. 1 year ago
muhammad.abbasi d99a083792 bug fixes 1 year ago
Sikander Saleem f694252828 null safety conversion after merge. 1 year ago
Sikander Saleem e6e35ab1d0 null safety conversion complete. 1 year ago
Sikander Saleem be4c8d7653 null safety conversation complete 1 year ago
Sikander Saleem fe8ac14e46 sdk upgrade changes-1. 1 year ago
Muhammad Abbasi ad1a01b7c6 initial commit 1 year ago
Sikander Saleem 2c6e81284d 1.2.2+9 uploaded. 1 year ago
Sikander Saleem 9631750eab improvement. 1 year ago
Sikander Saleem ed256dac7c improvements. 1 year ago
Sikander Saleem a1941511a0 call comments are mandatory now. 1 year ago
Sikander Saleem da442df2bb pending asset requests new parameter added. 1 year ago