Commit Graph

677 Commits (33dea074492bca2af582b6eb5fa0dbe0b7701cbd)

Author SHA1 Message Date
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 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
Sikander Saleem f043c6ff6c point 8 fixed, 9 months ago
WaseemAbbasi22 b506616f48 bug fixes for recurrent task and service request added missing details mentioned in bugs sheet 9 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
9 months ago
WaseemAbbasi22 5031c3cbb8 gas refill fixes 9 months ago
WaseemAbbasi22 045c890a27 bug fixes 9 months ago
WaseemAbbasi22 ab91baf216 bug fixes mentioned on excel sheet and tested with backend 10 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
10 months ago
WaseemAbbasi22 a66215ef8b bug fixes 10 months ago
Sikander Saleem e13a7c9634 rename text 10 months ago
Sikander Saleem 5825464ed5 ppm wo inspection back button added. 10 months ago
Sikander Saleem 99ef704913 rename points done 10 months ago
Sikander Saleem 5302858097 confirmation dialog added on ppm & recurrent 10 months ago
WaseemAbbasi22 15e62bb004 Task Request Design complete 10 months ago
Sikander Saleem 6b51805827 improvement 10 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
10 months ago
WaseemAbbasi22 be8c83cc8f Asset tranfer api integrated ready to test 10 months ago
WaseemAbbasi22 eb978af46f installition type task engineer ui complete 10 months ago
WaseemAbbasi22 54db7c97fc Task Request nurse side ui completed 10 months ago
Sikander Saleem 280c84a9cc full screen dialog added for selection. 10 months ago
Sikander Saleem c1295ac7b0 bug 726 fixed. 10 months ago
Sikander Saleem f6b4b77aed bug 734 fixed. 11 months ago
Sikander Saleem 15023ea99d bug 726 fixed. 11 months ago
WaseemAbbasi22 289d06ff68 Asset transfer nurse side ui completed 11 months ago
WaseemAbbasi22 48591de22a Merge branch 'design_3.0_ppm_new_flow' into design_3.0_transfer_request_new_flow 11 months ago
Sikander Saleem bd362cb0f6 bug 706 fixed. 11 months ago
Sikander Saleem ab6608f5a6 bug 703 fixed. 11 months ago
WaseemAbbasi22 6bd888e06a Merge branch 'design_3.0_ppm_new_flow' into design_3.0_transfer_request_new_flow 11 months ago
WaseemAbbasi22 152a0795c6 add and update gas refill ui and api integrated 11 months ago
Sikander Saleem 4a7f1eb037 ppm improvement, recurrent task improvement 11 months ago
WaseemAbbasi22 f06426091b room null value issue fixed in recurrent task 11 months ago
WaseemAbbasi22 3f90630db9 gas refill and asset transfer ui completed waiting for api 11 months ago
Sikander Saleem edd22bf4af stop working hide for nurse. 11 months ago