Commit Graph

303 Commits (cf30e729262c9eff303d9bedcc380b71bb9bc2b1)

Author SHA1 Message Date
Sikander Saleem 3ee2b66fbf code clean, unused files removed. 12 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
12 months ago
WaseemAbbasi22 9edaca4326 task request module flow completed and tested with backend 12 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
1 year ago
WaseemAbbasi22 71ee34c658 gas refill attachment and device transfer assistant employee issue fixes 1 year ago
Sikander Saleem e66ae78c83 files format 1 year ago
Sikander Saleem 015b73b634 ponit 87 fixed. 1 year ago
WaseemAbbasi22 2291350d6f added request type for task requests 1 year ago
WaseemAbbasi22 6795ba7f72 device transfer gas refill merged in ppm_newflow 1 year 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
1 year ago
WaseemAbbasi22 5031c3cbb8 gas refill fixes 1 year ago
WaseemAbbasi22 ab91baf216 bug fixes mentioned on excel sheet and tested with backend 1 year 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
1 year ago
WaseemAbbasi22 be8c83cc8f Asset tranfer api integrated ready to test 1 year ago
Sikander Saleem ef50f37a15 bug 703 fixed. 1 year ago
WaseemAbbasi22 6bd888e06a Merge branch 'design_3.0_ppm_new_flow' into design_3.0_transfer_request_new_flow 1 year ago
WaseemAbbasi22 152a0795c6 add and update gas refill ui and api integrated 1 year ago
Sikander Saleem 4a7f1eb037 ppm improvement, recurrent task improvement 1 year ago
WaseemAbbasi22 3f90630db9 gas refill and asset transfer ui completed waiting for api 1 year ago
Sikander Saleem edd22bf4af stop working hide for nurse. 1 year ago
Sikander Saleem 8fe01adcb0 ppm pm kits improvement 1 year ago
Sikander Saleem 58c0f176a6 Merge remote-tracking branch 'origin/design_3.0_ppm_new_flow' into design_3.0_ppm_new_flow 1 year ago
WaseemAbbasi22 7df18179a1 ppm task supplier ui completed and save and update api implemented 1 year ago
Sikander Saleem 4c328b2cba recurrent task timer improvements. 1 year ago
WaseemAbbasi22 b67e6dea11 Recurrent Work Order Complete ready to test 1 year ago
Sikander Saleem 28b30d9fa8 ppm data model upgraded. 1 year 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
1 year ago
Sikander Saleem 2cd5777f55 ppm model improvement. 1 year ago
WaseemAbbasi22 7b620b9f6e Merge remote-tracking branch 'origin/design_3.0_ppm_new_flow' into design_3.0_ppm_new_flow 1 year ago
WaseemAbbasi22 ce1044f201 timer and working hours issue fixes 1 year ago
Sikander Saleem 0a8b3314ce unsafe device added, swipe only added, force update added, 1 year 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
1 year ago
WaseemAbbasi22 d181c81029 save and complete api integrated for recurrent task 1 year ago
WaseemAbbasi22 99bcae1dc2 recurrent task api integrated 1 year ago
WaseemAbbasi22 c15cec364d Gas refill and Asset Transfer attributes addition done 1 year ago
WaseemAbbasi22 a5876ec1d3 swipe module added 1 year ago
WaseemAbbasi22 ba50ed5809 add swipe and forget password apis 1 year ago
Sikander Saleem 561881c7f2 non hmg employee cont-1 1 year ago
Sikander Saleem f3d52eef52 bug fixes 1 year ago
WaseemAbbasi22 c1ec32fa33 bug fixes 1 year ago
WaseemAbbasi22 4c9a730e24 all the changes are implemented 2 years ago
muhammad.abbasi fbdbdf67a0 improvements 2 years ago
muhammad.abbasi 77d18bd413 add maintenance request completed 2 years ago
muhammad.abbasi e8dc052d02 integrating api in new flow 2 years 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
2 years ago
muhammad.abbasi 8dd596bc35 -design completed 2 years 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
2 years ago
Sikander Saleem 0d333fa688 dashboard screen & service detail screen, flow changed. 2 years ago
muhammad.abbasi d99a083792 bug fixes 2 years ago
Sikander Saleem f694252828 null safety conversion after merge. 2 years ago